Commit graph

27401 commits

Author SHA1 Message Date
Tao Bao
1269cfbd02 Merge "Fix mounting /sdcard under recovery." am: 948b9c30b4
am: 506cbfa8b4

* commit '506cbfa8b4f8e70900527311528a60053dae1c61':
  Fix mounting /sdcard under recovery.
2016-01-13 18:50:12 +00:00
Alex Klyubin
614470e77d Merge "List SHA-1 digests of APK entries\' contents in .SF files." am: 6b452b2767
am: bad18cd9cf

* commit 'bad18cd9cff1c89f26da2ab771730eb682c9a73f':
  List SHA-1 digests of APK entries' contents in .SF files.
2016-01-13 18:50:06 +00:00
Tom Cherry
6ebff7a4d4 Merge "Remove special case handling of "ro." properties" am: 560fde999a
am: ca0091e26f

* commit 'ca0091e26fa31618d4693cad1f572d3e4e12bffe':
  Remove special case handling of "ro." properties
2016-01-13 18:50:00 +00:00
Clay Murphy
c067e1d1bc Merge "Docs: Shorten feedback button text." am: a3a9d929a6
am: 308033ba6b

* commit '308033ba6b9947bc860b27dc990a5c26d8f50f49':
  Docs: Shorten feedback button text.
2016-01-13 18:49:14 +00:00
Ying Wang
c6bafa661c Merge "Generate .c for .y and .l" am: 873eeec194
am: 0f0b6962ed

* commit '0f0b6962edcf65cf284bed22288d9eeb5b0478cc':
  Generate .c for .y and .l
2016-01-13 18:45:09 +00:00
Ying Wang
0afedd89f7 Merge "Move "include configure_local_jack.mk"" am: 5799af6563
am: 50b3d28dcc

* commit '50b3d28dcc66c6af4821d9655c782365a11fe284':
  Move "include configure_local_jack.mk"
2016-01-13 18:45:01 +00:00
Ying Wang
f0ebe165b9 Generate .c for .y and .l
- For .l/.y source files, generate .c files; for .ll/.yy source files,
  generate c++ files.
- Simplified the rules by adding the generated sources to
  my_generated_sources.
- Simplified generated header file naming by always using .h extension
  with bison's "--defines=" option.
- Removed the unnecesarry conditional inclusion to the generated
  headers. Bison already automatically generates such things.

Bug: 26492989
Change-Id: I9ab6dc149c258f7642bc36c3fa32f90ff7ee51a4
2016-01-12 21:07:27 -08:00
Zach Jang
c6c48b01d9 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5 am: 1b29f2f9c9 am: b0b568b5c8
am: a9ac12d276

* commit 'a9ac12d276448e30cadf34099dea7001d67a2c43':
  Updating security patch string to 2016-03-01
2016-01-13 02:11:25 +00:00
Tao Bao
506cbfa8b4 Merge "Fix mounting /sdcard under recovery."
am: 948b9c30b4

* commit '948b9c30b4197a709846e604c8e571d90161b17f':
  Fix mounting /sdcard under recovery.
2016-01-12 22:32:11 +00:00
Tao Bao
948b9c30b4 Merge "Fix mounting /sdcard under recovery." 2016-01-12 22:18:52 +00:00
Alex Klyubin
bad18cd9cf Merge "List SHA-1 digests of APK entries\' contents in .SF files."
am: 6b452b2767

* commit '6b452b276773e7f1149845e99777e119cf9754ca':
  List SHA-1 digests of APK entries' contents in .SF files.
2016-01-12 21:26:01 +00:00
Alex Klyubin
6b452b2767 Merge "List SHA-1 digests of APK entries' contents in .SF files." 2016-01-12 21:22:12 +00:00
Tom Cherry
ca0091e26f Merge "Remove special case handling of "ro." properties"
am: 560fde999a

* commit '560fde999ad87379e8adfbe36958a33db4eb1c81':
  Remove special case handling of "ro." properties
2016-01-12 20:54:38 +00:00
Alex Klyubin
8502937cff List SHA-1 digests of APK entries' contents in .SF files.
Due to a bug introduced in 8562fd478d
SHA-1 digests of APK entries' contents were listed under wrong
attribute name. The effect is equivalent to not listing SHA-1
digests.

This change fix the issue by listing SHA-1 digests under the correct
attribute name. However, these digests are not that useful because:
(1) typically the digest of the MANIFEST.MF verifies and thus the
per-entry digests are ignored, and (2) per-entry digests of entries
with names longer than 64 characters are wrong in any case because the
digest generation code does not take into account that such names are
split over multiple lines.

An alternative to this change would be to completely omit outputting
per-entry sections of .SF files, thus saving space and speeding up APK
verification (.SF files would decompress faster).

Bug: 26513901
Change-Id: If95d58e9baa62b1113639fe70724e1e9c9f4e15c
2016-01-12 12:36:46 -08:00
Tom Cherry
560fde999a Merge "Remove special case handling of "ro." properties" 2016-01-12 20:36:32 +00:00
Clay Murphy
308033ba6b Merge "Docs: Shorten feedback button text."
am: a3a9d929a6

* commit 'a3a9d929a61bf0574d8372d5932af6bde2e12920':
  Docs: Shorten feedback button text.
2016-01-12 19:49:33 +00:00
Tao Bao
3f56a33041 Fix mounting /sdcard under recovery.
The CL in [1] changed to create a symlink to /storage/self/primary for
/sdcard. It breaks the mount of /sdcard under recovery.

[1] commit 595003a3d06a13862052ef2f4f578371dae5ad65

Bug: 26509280
Change-Id: I98d02d54d707c2c8826c5ee119cf1a3ffa0c4bc9
2016-01-12 11:40:30 -08:00
Clay Murphy
a3a9d929a6 Merge "Docs: Shorten feedback button text." 2016-01-12 19:32:26 +00:00
Ying Wang
0f0b6962ed Merge "Generate .c for .y and .l"
am: 873eeec194

* commit '873eeec1944c46cd50779cd4fc8d4cd8ca0457ea':
  Generate .c for .y and .l
2016-01-12 18:57:03 +00:00
Ying Wang
50b3d28dcc Merge "Move "include configure_local_jack.mk""
am: 5799af6563

* commit '5799af6563c2da0a3730f1d4e007052c429ccaf8':
  Move "include configure_local_jack.mk"
2016-01-12 18:56:53 +00:00
Clay Murphy
b43f809da9 Docs: Shorten feedback button text.
Bug: 26452230
Change-Id: I8069d5087775a38f23e2aae86eb16fea81a65cd3
2016-01-12 10:55:44 -08:00
Ying Wang
873eeec194 Merge "Generate .c for .y and .l" 2016-01-12 17:35:30 +00:00
Ying Wang
5799af6563 Merge "Move "include configure_local_jack.mk"" 2016-01-12 17:34:26 +00:00
Ying Wang
64088f2459 Generate .c for .y and .l
- For .l/.y source files, generate .c files; for .ll/.yy source files,
  generate c++ files.
- Simplified the rules by adding the generated sources to
  my_generated_sources.
- Simplified generated header file naming by always using .h extension
  with bison's "--defines=" option.
- Removed the unnecesarry conditional inclusion to the generated
  headers. Bison already automatically generates such things.

Bug: 26492989
Change-Id: I9ab6dc149c258f7642bc36c3fa32f90ff7ee51a4
2016-01-11 17:41:56 -08:00
Zach Jang
a9ac12d276 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5 am: 1b29f2f9c9
am: b0b568b5c8

* commit 'b0b568b5c8731e40c53a6bfc3149a3720d1a2570':
  Updating security patch string to 2016-03-01
2016-01-12 01:40:37 +00:00
Zach Jang
b0b568b5c8 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5
am: 1b29f2f9c9

* commit '1b29f2f9c97bc1b099712cd7c93c31e7f7a18ad1':
  Updating security patch string to 2016-03-01
2016-01-12 01:38:31 +00:00
Zach Jang
1b29f2f9c9 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7
am: 6facd249d5

* commit '6facd249d51ffef6afa369b11041ae07733883b8':
  Updating security patch string to 2016-03-01
2016-01-12 01:35:21 +00:00
Zach Jang
6facd249d5 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57
am: 6c61548bb7

* commit '6c61548bb7e426704760c9351e3211fb45d67dae':
  Updating security patch string to 2016-03-01
2016-01-12 01:33:23 +00:00
Zach Jang
6c61548bb7 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f
am: c9da4cce57

* commit 'c9da4cce57d387f52b675d1024459af5e73c6dbc':
  Updating security patch string to 2016-03-01
2016-01-12 01:30:53 +00:00
Zach Jang
c9da4cce57 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e
am: 53e7d9bf7f

* commit '53e7d9bf7f298c438157dccc5222b7484b083d9e':
  Updating security patch string to 2016-03-01
2016-01-12 01:28:37 +00:00
Zach Jang
53e7d9bf7f Updating security patch string to 2016-03-01 am: c24c6ccd4d
am: 293887c43e

* commit '293887c43ee5b797f8628f5983f64bf766002009':
  Updating security patch string to 2016-03-01
2016-01-12 01:26:41 +00:00
Zach Jang
293887c43e Updating security patch string to 2016-03-01
am: c24c6ccd4d

* commit 'c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
  Updating security patch string to 2016-03-01
2016-01-12 01:24:55 +00:00
Zach Jang
c24c6ccd4d Updating security patch string to 2016-03-01
b/26499556

Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
2016-01-11 17:12:37 -08:00
Jim Kaye
206fb06c2c Emulator: Have the Settings page say "About emulated device"
The Settings page for a real device says "About phone" or
"About tablet". This text is selected at build time, so the
Emulator cannot get the Sytem to choose correctly at launch time.

Our solution is to say "About emulated device" for all types
of virtual devices.

Change-Id: Ia52c20b794f76230f5b73694fb193c18b173c329
2016-01-11 23:41:34 +00:00
Ying Wang
a8f28ff859 Move "include configure_local_jack.mk"
Move "include configure_local_jack.mk" out of the scope of
"ifdef LOCAL_RESOURCE_DIR".

Change-Id: I67bbb4e6b59414559219d24136ff91ba799fda25
2016-01-11 13:34:16 -08:00
Tom Cherry
69035cd4aa Remove special case handling of "ro." properties
Currently, properties that begin with "ro." are special cased to skip
over the "ro." part of the prefix before matching with entries in
property_contexts.  A change to init is removing this special case and
therefore, the "ro." prefixes must be explicitly added to
property_contexts.

Bug 26425619

Change-Id: I735eb9fc208eeec284cda8d778db946eeec24192
2016-01-11 13:16:45 -08:00
Neil Fuller
89f7020deb Merge "Revert "Make OpenJDK 8 the default"" 2016-01-11 13:47:33 +00:00
Neil Fuller
a87553f414 Revert "Make OpenJDK 8 the default"
Reverting until all continuous builds that cover branches downstream of master can be updated to use JDK 8.

This reverts commit 1bd16b67c4.

Change-Id: Icb0daa440a6286e07d3cfd9ff8b082b4154ebc21
2016-01-11 13:37:43 +00:00
Neil Fuller
8e755e7b4d Merge "Make OpenJDK 8 the default" 2016-01-11 13:20:06 +00:00
Narayan Kamath
0abf9152fc Merge "Remove libsqlite_jni from all product configs." am: 4203ee20f1
am: 3eb6d15e6f

* commit '3eb6d15e6f207391f574fa0259e51e3deb391248':
  Remove libsqlite_jni from all product configs.
2016-01-11 11:45:56 +00:00
Narayan Kamath
3eb6d15e6f Merge "Remove libsqlite_jni from all product configs."
am: 4203ee20f1

* commit '4203ee20f13b1dd3ec9100f5045c19541f70da33':
  Remove libsqlite_jni from all product configs.
2016-01-11 11:43:46 +00:00
Narayan Kamath
4203ee20f1 Merge "Remove libsqlite_jni from all product configs." 2016-01-11 11:39:15 +00:00
Neil Fuller
1bd16b67c4 Make OpenJDK 8 the default
To return to OpenJDK 7:
export LEGACY_USE_JAVA7=true

And run envsetup.sh/lunch again.

Bug: 25786468
Change-Id: Iba08a9d3cf73bae7124e431dfe87c20ac219591e
2016-01-11 11:25:26 +00:00
Gina Dimino
86d7ffb6c6 Merge "Docs: Changing text on Feedback button. Bug: 26452230" am: 49d5d5576e
am: 256dbdc76d

* commit '256dbdc76d5f133c0520ff6b2f4d1fc51036adf2':
  Docs: Changing text on Feedback button. Bug: 26452230
2016-01-08 18:39:03 +00:00
Gina Dimino
256dbdc76d Merge "Docs: Changing text on Feedback button. Bug: 26452230"
am: 49d5d5576e

* commit '49d5d5576e714a733b952506bcc49d660d8a4afb':
  Docs: Changing text on Feedback button. Bug: 26452230
2016-01-08 18:37:02 +00:00
Gina Dimino
49d5d5576e Merge "Docs: Changing text on Feedback button. Bug: 26452230" 2016-01-08 18:31:38 +00:00
Daniel Sandler
40e8066416 Merge "More helpful diagnostics when selecting a Mac SDK." 2016-01-08 16:42:54 +00:00
Narayan Kamath
58408f645a Remove libsqlite_jni from all product configs.
It's only used by libcore tests so there's no need to ship it on
all products.

bug: 26457850
Change-Id: I907f781d215e94e1cbf554d81fda9e6eed07a4de
2016-01-08 11:02:36 +00:00
Tianjie Xu
2349dfa78f Merge "Check block0 for remounting partition R/W" am: 0b109751b8
am: 3236cfd672

* commit '3236cfd672ba2cc27e8e488ff530a9731d281751':
  Check block0 for remounting partition R/W
2016-01-08 00:55:58 +00:00
Tianjie Xu
3236cfd672 Merge "Check block0 for remounting partition R/W"
am: 0b109751b8

* commit '0b109751b8f767e9191f1d84f345ee70690be9fa':
  Check block0 for remounting partition R/W
2016-01-08 00:54:12 +00:00