OSDN Git Service
Rubin Xu [Tue, 16 Jun 2015 22:04:48 +0000 (22:04 +0000)]
am
befbdb00: am
a4f1642b: am
dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev
* commit '
befbdb00f9b3bd7edcbdd688754c9b782a4bb73c':
Deprecate SHA-1 in ManagedProvisioning (API doc change)
Chris Wren [Tue, 16 Jun 2015 22:04:41 +0000 (22:04 +0000)]
am
bf539186: am
db31e283: am
3397727b: Merge "disable verbose logs from people notifications." into mnc-dev
* commit '
bf539186cb506a9f8eafdf2c5891555d97260ee5':
disable verbose logs from people notifications.
Felipe Leme [Tue, 16 Jun 2015 22:04:35 +0000 (22:04 +0000)]
am
46301a62: am
8234ed70: am
fcb55902: Merge "Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM." into mnc-dev
* commit '
46301a62ea8e06abc6f01b74740da0f807345472':
Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM.
John Reck [Tue, 16 Jun 2015 22:04:29 +0000 (22:04 +0000)]
am
f9fd28e7: am
de3799ca: am
f24bed80: Merge "Fix null deref" into mnc-dev
* commit '
f9fd28e7948c245786c40d808642eaf868e94518':
Fix null deref
Fyodor Kupolov [Tue, 16 Jun 2015 22:04:23 +0000 (22:04 +0000)]
am
e8d84046: am
4c1e8ecf: am
27a88a3e: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev
* commit '
e8d8404614dc7351eee522ec0d003ed2d096caf1':
Additional OP_READ_PHONE_STATE AppOps checks for telephony
Felipe Leme [Tue, 16 Jun 2015 22:04:17 +0000 (22:04 +0000)]
am
1d882baf: am
0fe3f871: am
a106554c: Merge "Changed BugReportReceiver to send zipped bugreports." into mnc-dev
* commit '
1d882bafc7dc855951ba980529560b48f95e4fb3':
Changed BugReportReceiver to send zipped bugreports.
Chirag Shah [Tue, 16 Jun 2015 22:04:11 +0000 (22:04 +0000)]
am
3db44d08: am
f40f46e9: am
7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev
* commit '
3db44d08ea8fb083ec952ff647b6037bb9b2253d':
Allow 3P apps to provide structured data within AssistContent.
Jason Monk [Tue, 16 Jun 2015 22:04:05 +0000 (22:04 +0000)]
am
225a049d: am
cb44d7d7: am
ece811da: Merge "Add ic_dialog_alert_material to symbols" into mnc-dev
* commit '
225a049d7a95f9584a97d99c758a385ec50d41b5':
Add ic_dialog_alert_material to symbols
Dianne Hackborn [Tue, 16 Jun 2015 22:03:58 +0000 (22:03 +0000)]
am
726d6993: am
1141dea8: am
9cc842f0: Merge "Fix issue #
21816660 (app standby), work on issue #
20882522 (voice interact)" into mnc-dev
* commit '
726d6993aede9ae5e36dabaafe81266e0b276090':
Fix issue #
21816660 (app standby), work on issue #
20882522 (voice interact)
Abodunrinwa Toki [Tue, 16 Jun 2015 22:03:52 +0000 (22:03 +0000)]
am
a9eee504: am
03c70cac: am
98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev
* commit '
a9eee50455ff3894a17273fa1ffac2700cfa0d4c':
Fix floating toolbar flickers.
George Mount [Tue, 16 Jun 2015 22:03:46 +0000 (22:03 +0000)]
am
b5f0e3bd: am
2a255904: am
209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev
* commit '
b5f0e3bdba93fbe61056c8f4b8c82e342f5da164':
Have the final setVisibility cause a requestLayout.
Mark Salyzyn [Tue, 16 Jun 2015 22:03:39 +0000 (22:03 +0000)]
am
5c5fc990: am
2cfdf938: am
2b3db144: jni: isLoggable calls __android_log_is_loggable
* commit '
5c5fc99091fb811382d38df1db9bc4b85e221039':
jni: isLoggable calls __android_log_is_loggable
Benjamin Franz [Tue, 16 Jun 2015 22:03:33 +0000 (22:03 +0000)]
am
3be79152: am
84e38f68: am
dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
* commit '
3be79152cf98b6033788d3e20c8f1dac7aefde35':
Update documentation for PASSWORD_QUALITY_SOMETHING
Clara Bayarri [Tue, 16 Jun 2015 22:03:26 +0000 (22:03 +0000)]
am
17fc9ddc: am
e979193e: am
ec01f3d2: Merge "Add suggested width for Floating Toolbar on large devices" into mnc-dev
* commit '
17fc9ddc98d21b6ccabdd58eb276a81fea20af1f':
Add suggested width for Floating Toolbar on large devices
Abodunrinwa Toki [Tue, 16 Jun 2015 22:03:20 +0000 (22:03 +0000)]
am
686a2e63: am
7ebde83a: am
6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev
* commit '
686a2e633c0cb9ab4a31333cd36c30fea9991776':
Floating toolbar no longer obstructs the soft keyboard.
Narayan Kamath [Tue, 16 Jun 2015 22:03:13 +0000 (22:03 +0000)]
am
ba6e9b12: am
2d13fe56: am
275294db: Merge "Better systrace slices for application startup." into mnc-dev
* commit '
ba6e9b12a23657995b7761daf1b83366c652626e':
Better systrace slices for application startup.
Paul Jensen [Tue, 16 Jun 2015 22:03:06 +0000 (22:03 +0000)]
am
79cd02c4: am
8235c839: am
19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
* commit '
79cd02c4b0ada6eff5979f0cd39f3799606ba9bb':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
Rubin Xu [Tue, 16 Jun 2015 21:25:28 +0000 (21:25 +0000)]
am
a4f1642b: am
dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev
* commit '
a4f1642ba16c13779d6a8ef187096259bcd1fd6f':
Deprecate SHA-1 in ManagedProvisioning (API doc change)
Chris Wren [Tue, 16 Jun 2015 21:25:18 +0000 (21:25 +0000)]
am
db31e283: am
3397727b: Merge "disable verbose logs from people notifications." into mnc-dev
* commit '
db31e283af0d77ec59a83841b1c3fe4f8e40aebe':
disable verbose logs from people notifications.
Felipe Leme [Tue, 16 Jun 2015 21:25:13 +0000 (21:25 +0000)]
am
8234ed70: am
fcb55902: Merge "Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM." into mnc-dev
* commit '
8234ed70cb8b009845a9b0e974e7fdfb1eefafeb':
Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM.
John Reck [Tue, 16 Jun 2015 21:25:03 +0000 (21:25 +0000)]
am
de3799ca: am
f24bed80: Merge "Fix null deref" into mnc-dev
* commit '
de3799ca167dc424e2128dd3a041efaa806dde7c':
Fix null deref
Fyodor Kupolov [Tue, 16 Jun 2015 21:24:58 +0000 (21:24 +0000)]
am
4c1e8ecf: am
27a88a3e: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev
* commit '
4c1e8ecf0003f18105819a34e7c182dd9eb64d93':
Additional OP_READ_PHONE_STATE AppOps checks for telephony
Felipe Leme [Tue, 16 Jun 2015 21:24:53 +0000 (21:24 +0000)]
am
0fe3f871: am
a106554c: Merge "Changed BugReportReceiver to send zipped bugreports." into mnc-dev
* commit '
0fe3f8715fd9d4b9d546073d048b33744b695233':
Changed BugReportReceiver to send zipped bugreports.
Chirag Shah [Tue, 16 Jun 2015 21:24:48 +0000 (21:24 +0000)]
am
f40f46e9: am
7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev
* commit '
f40f46e94c773676158b3f7e9cd51157cc9a91d2':
Allow 3P apps to provide structured data within AssistContent.
Jason Monk [Tue, 16 Jun 2015 21:24:44 +0000 (21:24 +0000)]
am
cb44d7d7: am
ece811da: Merge "Add ic_dialog_alert_material to symbols" into mnc-dev
* commit '
cb44d7d72c7a14018eb498e343604bd3573f676e':
Add ic_dialog_alert_material to symbols
Dianne Hackborn [Tue, 16 Jun 2015 21:24:39 +0000 (21:24 +0000)]
am
1141dea8: am
9cc842f0: Merge "Fix issue #
21816660 (app standby), work on issue #
20882522 (voice interact)" into mnc-dev
* commit '
1141dea8e074d1a0dd67673e26f54f950d60ba3e':
Fix issue #
21816660 (app standby), work on issue #
20882522 (voice interact)
Abodunrinwa Toki [Tue, 16 Jun 2015 21:24:34 +0000 (21:24 +0000)]
am
03c70cac: am
98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev
* commit '
03c70cac9a0d9dc7c9f2c71b28aaf609393fdcf3':
Fix floating toolbar flickers.
George Mount [Tue, 16 Jun 2015 21:24:30 +0000 (21:24 +0000)]
am
2a255904: am
209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev
* commit '
2a25590428d3fa8e01f74f214b7c4c2d1c712afe':
Have the final setVisibility cause a requestLayout.
Mark Salyzyn [Tue, 16 Jun 2015 21:24:25 +0000 (21:24 +0000)]
am
2cfdf938: am
2b3db144: jni: isLoggable calls __android_log_is_loggable
* commit '
2cfdf938b0d934a1aab54a0bd83fa722cc5cc31a':
jni: isLoggable calls __android_log_is_loggable
Benjamin Franz [Tue, 16 Jun 2015 21:24:20 +0000 (21:24 +0000)]
am
84e38f68: am
dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
* commit '
84e38f687819e47ffe3bae1fd2588d0f22fafa90':
Update documentation for PASSWORD_QUALITY_SOMETHING
Clara Bayarri [Tue, 16 Jun 2015 21:24:15 +0000 (21:24 +0000)]
am
e979193e: am
ec01f3d2: Merge "Add suggested width for Floating Toolbar on large devices" into mnc-dev
* commit '
e979193e48888e7651a641e42d3442262cbbb0dd':
Add suggested width for Floating Toolbar on large devices
Abodunrinwa Toki [Tue, 16 Jun 2015 21:24:10 +0000 (21:24 +0000)]
am
7ebde83a: am
6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev
* commit '
7ebde83a479f6447e0862e814830374a8477665b':
Floating toolbar no longer obstructs the soft keyboard.
Narayan Kamath [Tue, 16 Jun 2015 21:24:04 +0000 (21:24 +0000)]
am
2d13fe56: am
275294db: Merge "Better systrace slices for application startup." into mnc-dev
* commit '
2d13fe56eec54030fe09cae74c7a92be54c8bd19':
Better systrace slices for application startup.
Paul Jensen [Tue, 16 Jun 2015 21:24:00 +0000 (21:24 +0000)]
am
8235c839: am
19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
* commit '
8235c839aa9caaf6b36820007f928367bd829736':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
Rubin Xu [Tue, 16 Jun 2015 20:07:45 +0000 (20:07 +0000)]
am
dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev
* commit '
dd862aebda15a5b63c90b1b670373028b48172c4':
Deprecate SHA-1 in ManagedProvisioning (API doc change)
Chris Wren [Tue, 16 Jun 2015 20:07:39 +0000 (20:07 +0000)]
am
3397727b: Merge "disable verbose logs from people notifications." into mnc-dev
* commit '
3397727b165a432ab5d82789798375f4688c6b1e':
disable verbose logs from people notifications.
Felipe Leme [Tue, 16 Jun 2015 20:07:31 +0000 (20:07 +0000)]
am
fcb55902: Merge "Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM." into mnc-dev
* commit '
fcb559021da91b13ff3b0efd86b9aba957f9712c':
Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM.
John Reck [Tue, 16 Jun 2015 20:07:26 +0000 (20:07 +0000)]
am
f24bed80: Merge "Fix null deref" into mnc-dev
* commit '
f24bed80e027a2b14652ac9d46900c11312efa6b':
Fix null deref
Fyodor Kupolov [Tue, 16 Jun 2015 20:07:22 +0000 (20:07 +0000)]
am
27a88a3e: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev
* commit '
27a88a3eb6a6a456ea3ec1b81a8fb26333f904a5':
Additional OP_READ_PHONE_STATE AppOps checks for telephony
Felipe Leme [Tue, 16 Jun 2015 20:07:15 +0000 (20:07 +0000)]
am
a106554c: Merge "Changed BugReportReceiver to send zipped bugreports." into mnc-dev
* commit '
a106554c20c72e284d64ea074933554e5dc29da9':
Changed BugReportReceiver to send zipped bugreports.
Chirag Shah [Tue, 16 Jun 2015 20:07:11 +0000 (20:07 +0000)]
am
7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev
* commit '
7f92f06742fe3b66b9e8049db62ea55e1b41adf5':
Allow 3P apps to provide structured data within AssistContent.
Jason Monk [Tue, 16 Jun 2015 20:07:05 +0000 (20:07 +0000)]
am
ece811da: Merge "Add ic_dialog_alert_material to symbols" into mnc-dev
* commit '
ece811dac9a2784b4a2937a4ece75b58d0db9e8b':
Add ic_dialog_alert_material to symbols
Dianne Hackborn [Tue, 16 Jun 2015 20:07:01 +0000 (20:07 +0000)]
am
9cc842f0: Merge "Fix issue #
21816660 (app standby), work on issue #
20882522 (voice interact)" into mnc-dev
* commit '
9cc842f0ee491aa7b4fcea02823c3aa273465ac1':
Fix issue #
21816660 (app standby), work on issue #
20882522 (voice interact)
Abodunrinwa Toki [Tue, 16 Jun 2015 20:06:55 +0000 (20:06 +0000)]
am
98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev
* commit '
98f98dd19def468afc310bd879cb79cce9917ba2':
Fix floating toolbar flickers.
George Mount [Tue, 16 Jun 2015 20:06:49 +0000 (20:06 +0000)]
am
209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev
* commit '
209fb43376989c9a68f947d12bae3ea87e4101d2':
Have the final setVisibility cause a requestLayout.
Mark Salyzyn [Tue, 16 Jun 2015 20:06:38 +0000 (20:06 +0000)]
am
2b3db144: jni: isLoggable calls __android_log_is_loggable
* commit '
2b3db1444ab0bb7c2a2d13febb4fa88aebecf74c':
jni: isLoggable calls __android_log_is_loggable
Benjamin Franz [Tue, 16 Jun 2015 20:06:33 +0000 (20:06 +0000)]
am
dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
* commit '
dbc86ad170e2c288f0154a264d12bd6dadf78c45':
Update documentation for PASSWORD_QUALITY_SOMETHING
Clara Bayarri [Tue, 16 Jun 2015 20:06:28 +0000 (20:06 +0000)]
am
ec01f3d2: Merge "Add suggested width for Floating Toolbar on large devices" into mnc-dev
* commit '
ec01f3d276e2e06647f5a71e45b06e7cf964cc19':
Add suggested width for Floating Toolbar on large devices
Abodunrinwa Toki [Tue, 16 Jun 2015 20:06:23 +0000 (20:06 +0000)]
am
6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev
* commit '
6161c5b4cd54036bc4f38455a0c7c11b8201e4a0':
Floating toolbar no longer obstructs the soft keyboard.
Narayan Kamath [Tue, 16 Jun 2015 20:06:19 +0000 (20:06 +0000)]
am
275294db: Merge "Better systrace slices for application startup." into mnc-dev
* commit '
275294dbce30eb1f9ef4847d0f9c3d6b602de06c':
Better systrace slices for application startup.
Paul Jensen [Tue, 16 Jun 2015 20:06:15 +0000 (20:06 +0000)]
am
19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
* commit '
19769114b48152efa57527574ee533c8e33db703':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
Rubin Xu [Tue, 16 Jun 2015 18:15:27 +0000 (18:15 +0000)]
Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev
Chris Wren [Tue, 16 Jun 2015 17:54:10 +0000 (17:54 +0000)]
Merge "disable verbose logs from people notifications." into mnc-dev
Felipe Leme [Tue, 16 Jun 2015 17:37:46 +0000 (17:37 +0000)]
Merge "Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM." into mnc-dev
John Reck [Tue, 16 Jun 2015 17:34:27 +0000 (17:34 +0000)]
Merge "Fix null deref" into mnc-dev
Felipe Leme [Tue, 16 Jun 2015 17:25:06 +0000 (10:25 -0700)]
Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM.
BUG:
20447313
Change-Id: I66f90cdd2a07288f9e37a38185f1583c57cf65c8
John Reck [Tue, 16 Jun 2015 17:29:31 +0000 (10:29 -0700)]
Fix null deref
Bug:
21857172
willHaveFunctor was assuming that either mStagingDisplayList
or mDisplayList would be non-null but this isn't true. Both
can be null in some scenarios (notably after a trimMemory)
Change-Id: Ia2915b84cfc907ec9c7cbec54ed6dc26283ec998
Fyodor Kupolov [Tue, 16 Jun 2015 17:14:58 +0000 (17:14 +0000)]
Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev
Felipe Leme [Tue, 16 Jun 2015 16:59:47 +0000 (16:59 +0000)]
Merge "Changed BugReportReceiver to send zipped bugreports." into mnc-dev
Chirag Shah [Tue, 16 Jun 2015 16:54:00 +0000 (16:54 +0000)]
Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev
Jason Monk [Tue, 16 Jun 2015 16:46:46 +0000 (16:46 +0000)]
Merge "Add ic_dialog_alert_material to symbols" into mnc-dev
Dianne Hackborn [Tue, 16 Jun 2015 16:40:57 +0000 (16:40 +0000)]
Merge "Fix issue #
21816660 (app standby), work on issue #
20882522 (voice interact)" into mnc-dev
Felipe Leme [Mon, 1 Jun 2015 19:21:46 +0000 (12:21 -0700)]
Changed BugReportReceiver to send zipped bugreports.
When BugReporterReceiver receives a android.permission.DUMP, it will handle the bugreport file (extra android.intent.extra.BUGREPORT) depending on its format:
- If it's a plain-text file (extension .txt), it will create a zip file with the plain-text report renamed as bugreport.txt.
- If there is an error creating the zip file, the plain-text bugreport will be sent instead.
- If it's not a plain-text file, it fill send the file as is (so if 'dumpstate' is later changed to generate a zipped file directly, nothing has to be done here).
Note that only the bugreport itself is included in the zip file, the screenshot is still sent separately (extra android.intent.extra.SCREENSHOT), so the receiver of the bugreport intent can display a screenshot thumbnail without unzipping the other file (which is useful when sending the bugreport through GMail, for example).
BUG:
20447313
BUG:
21868658
Change-Id: I3fa1e0c89190bfe6fa5c418f0f01ce1fb376f537
Abodunrinwa Toki [Tue, 16 Jun 2015 15:54:24 +0000 (15:54 +0000)]
Merge "Fix floating toolbar flickers." into mnc-dev
George Mount [Tue, 16 Jun 2015 15:27:25 +0000 (15:27 +0000)]
Merge "Have the final setVisibility cause a requestLayout." into mnc-dev
Jason Monk [Tue, 16 Jun 2015 15:26:00 +0000 (11:26 -0400)]
Add ic_dialog_alert_material to symbols
Bug:
20751702
Change-Id: I43f8a6020968ffb7ea6e07061258efeb395a3c91
Chris Wren [Tue, 16 Jun 2015 15:23:12 +0000 (11:23 -0400)]
disable verbose logs from people notifications.
Bug:
20258744
Change-Id: Ifa3fb4f6aefaab4d6c669b1e60f8536515725c0f
Mark Salyzyn [Tue, 16 Jun 2015 14:47:07 +0000 (14:47 +0000)]
am
34d65a51: am
b17c58dd: am
26a40606: Merge "jni: isLoggable calls __android_log_is_loggable"
* commit '
34d65a513aa99671f24831495d97765de8b91766':
jni: isLoggable calls __android_log_is_loggable
Abodunrinwa Toki [Tue, 16 Jun 2015 14:47:04 +0000 (15:47 +0100)]
Fix floating toolbar flickers.
-Flicker was a side effect the delay in hiding the toolbar when
there is a down press on a TextView handle. The timing clashed
with the time it takes for the FloatingActionMode to release a
hide lock on a changing content rect. Extra flickers also happened
if the ActionMode happened to be invalidated at about the same time.
Since there was no longer a hide lock, the toolbar refreshed, getting
rid of the "Select all" menu item.
FIX. I believe we don't need the delayed hide on down press on a
TextView handle. I've removed this.
-I've also updated FloatingActionMode to ensure that hide locks
overlap one another if necessary. The toolbar can only be visible if
all locks are off.
Bug:
21793687
Change-Id: I290ea45ab17d5862b453cb319afb4c8ffe084cd0
Mark Salyzyn [Tue, 16 Jun 2015 14:35:25 +0000 (14:35 +0000)]
am
b17c58dd: am
26a40606: Merge "jni: isLoggable calls __android_log_is_loggable"
* commit '
b17c58dd7f923f87f65c2c1ef644ab0f1b60c1da':
jni: isLoggable calls __android_log_is_loggable
Mark Salyzyn [Tue, 16 Jun 2015 14:21:40 +0000 (14:21 +0000)]
am
26a40606: Merge "jni: isLoggable calls __android_log_is_loggable"
* commit '
26a406063732587a667d6c389cfd055a7ceab566':
jni: isLoggable calls __android_log_is_loggable
Mark Salyzyn [Fri, 24 Apr 2015 22:55:40 +0000 (15:55 -0700)]
jni: isLoggable calls __android_log_is_loggable
(cherry pick from commit
8685a4569d2bdcb1a7361e3d75f832cf3ba9d4b6)
Will inherit additional functionality and cache improvements
Bug:
17760225
Change-Id: Iab1816d37cc74343d83629d851a5784d4865ebb4
Mark Salyzyn [Tue, 16 Jun 2015 14:08:39 +0000 (14:08 +0000)]
Merge "jni: isLoggable calls __android_log_is_loggable"
Benjamin Franz [Tue, 16 Jun 2015 13:22:19 +0000 (13:22 +0000)]
Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
Clara Bayarri [Tue, 16 Jun 2015 12:41:06 +0000 (12:41 +0000)]
Merge "Add suggested width for Floating Toolbar on large devices" into mnc-dev
Abodunrinwa Toki [Tue, 16 Jun 2015 12:29:52 +0000 (12:29 +0000)]
Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev
Narayan Kamath [Tue, 16 Jun 2015 11:50:56 +0000 (11:50 +0000)]
Merge "Better systrace slices for application startup." into mnc-dev
Paul Jensen [Tue, 16 Jun 2015 11:30:49 +0000 (11:30 +0000)]
Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
Narayan Kamath [Fri, 12 Jun 2015 14:34:35 +0000 (15:34 +0100)]
Better systrace slices for application startup.
This change adds three new timeslices :
- PostFork : As soon as possible after the app forks from the
zygote. Can be used in conjunction with the system_server
"Start proc:" event to derive an upper bound on fork() and
zygote overhead.
- RuntimeInit & ActivityThreadMain for ZygoteInit#runtimeInit
and ActivityThread#main.
ActivityThread#handleBindApplication and higher level functions
are already well instrumented in systrace. handleBindApplication
should occur immediately after ActivityThread#main.
Note that we use the Activity manager tag to make it easier to
correlate these new events with surrounding events (Start proc
and handleBindApplication) that are already using the AM tag.
bug:
21632700
Change-Id: Ibc01f1721f962c913f3c02a51763b6feb1eb6a4d
Benjamin Franz [Tue, 16 Jun 2015 10:23:38 +0000 (11:23 +0100)]
Update documentation for PASSWORD_QUALITY_SOMETHING
Add a mention that PASSWORD_QUALITY_SOMETHING includes patterns.
Bug:
20441473
Change-Id: I2608f36e338fb2bfbace80d49ee805841d59fa17
Jeff Sharkey [Tue, 16 Jun 2015 05:44:15 +0000 (05:44 +0000)]
am
10d045cd: am
716978e3: am
2cc03e56: Yet another user restriction.
* commit '
10d045cd08a60403056f90f03b8f79dc0bf18571':
Yet another user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:28:43 +0000 (05:28 +0000)]
am
716978e3: am
2cc03e56: Yet another user restriction.
* commit '
716978e36b30f339e615eee289a8cbc6f68a4df4':
Yet another user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:22:00 +0000 (05:22 +0000)]
am
835a40aa: am
7f39beb2: am
a65a1582: Merge "Update file size formatting." into mnc-dev
* commit '
835a40aac0600b0ba0e2615a80ba000fedb585e2':
Update file size formatting.
Jeff Sharkey [Tue, 16 Jun 2015 05:16:54 +0000 (05:16 +0000)]
am
2cc03e56: Yet another user restriction.
* commit '
2cc03e5606ad7cd473283898400506d5ac2237ba':
Yet another user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:10:51 +0000 (05:10 +0000)]
am
7f39beb2: am
a65a1582: Merge "Update file size formatting." into mnc-dev
* commit '
7f39beb28e2f20c54529848cbee3429d17ae76ec':
Update file size formatting.
Jeff Sharkey [Tue, 16 Jun 2015 05:01:43 +0000 (05:01 +0000)]
am
a65a1582: Merge "Update file size formatting." into mnc-dev
* commit '
a65a1582f5a04b15b53ebdec337ac611ccb78a07':
Update file size formatting.
Selim Cinek [Tue, 16 Jun 2015 04:54:27 +0000 (04:54 +0000)]
am
6bd2eb9b: am
b4d9e24f: am
89285039: Merge "Fixed a bug where the statusbar was still visible while dozing" into mnc-dev
* commit '
6bd2eb9b117eeef9d6cbee9bf196aedd72eb9692':
Fixed a bug where the statusbar was still visible while dozing
Jeff Sharkey [Fri, 20 Mar 2015 18:24:04 +0000 (11:24 -0700)]
Yet another user restriction.
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
Jeff Sharkey [Tue, 16 Jun 2015 04:47:16 +0000 (04:47 +0000)]
Merge "Update file size formatting." into mnc-dev
Selim Cinek [Tue, 16 Jun 2015 04:42:14 +0000 (04:42 +0000)]
am
b4d9e24f: am
89285039: Merge "Fixed a bug where the statusbar was still visible while dozing" into mnc-dev
* commit '
b4d9e24f0644f3946d4b20e0c9d22bf6e0e69ace':
Fixed a bug where the statusbar was still visible while dozing
Jeff Sharkey [Tue, 16 Jun 2015 04:09:10 +0000 (21:09 -0700)]
Update file size formatting.
Per UX, default strings should have space between value and units
resulting in "12.3 GB". Add a formatting variant that returns the
various components for callers who want to build their own strings.
For now there is only one mounted emulated volume at a time, and
it's always the primary storage, so give it the default rootId to
keep old Uris working.
Change-Id: Ifcc72a91a6b397ee65dc92642153286186eb64ac
Selim Cinek [Tue, 16 Jun 2015 04:28:37 +0000 (04:28 +0000)]
am
89285039: Merge "Fixed a bug where the statusbar was still visible while dozing" into mnc-dev
* commit '
892850396c21db891df784c0e1bb78115feee908':
Fixed a bug where the statusbar was still visible while dozing
Jim Miller [Tue, 16 Jun 2015 04:17:32 +0000 (04:17 +0000)]
am
d9ceaab0: am
c8b5e94c: am
b1c6208c: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
* commit '
d9ceaab05a3cd91576cb6c2749ec105b44c86438':
Limit number of fingerprint templates that can be enrolled per device user
Erik Kline [Tue, 16 Jun 2015 04:17:27 +0000 (04:17 +0000)]
am
47585f46: am
a01b9e6f: am
0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
* commit '
47585f462a9cde661169b16cea870c05e91d92f8':
Add a test that Network#getNetworkHandle() behaves sanely.
Selim Cinek [Tue, 16 Jun 2015 04:16:01 +0000 (04:16 +0000)]
Merge "Fixed a bug where the statusbar was still visible while dozing" into mnc-dev
Jim Miller [Tue, 16 Jun 2015 04:05:07 +0000 (04:05 +0000)]
am
c8b5e94c: am
b1c6208c: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
* commit '
c8b5e94c2b65ddd92690c90038070e6dd31ddc78':
Limit number of fingerprint templates that can be enrolled per device user
Erik Kline [Tue, 16 Jun 2015 04:05:03 +0000 (04:05 +0000)]
am
a01b9e6f: am
0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
* commit '
a01b9e6f43b2c5d6a083b34ae0c8140abb09806a':
Add a test that Network#getNetworkHandle() behaves sanely.
Jim Miller [Tue, 16 Jun 2015 03:55:59 +0000 (03:55 +0000)]
am
b1c6208c: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
* commit '
b1c6208c27041e6d161cc46b4f130b4abfcf8f88':
Limit number of fingerprint templates that can be enrolled per device user
Erik Kline [Tue, 16 Jun 2015 03:55:55 +0000 (03:55 +0000)]
am
0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
* commit '
0d16281a03722f3f66a076718251c2166518d122':
Add a test that Network#getNetworkHandle() behaves sanely.
Selim Cinek [Tue, 16 Jun 2015 03:55:04 +0000 (20:55 -0700)]
Fixed a bug where the statusbar was still visible while dozing
Bug:
18903923
Change-Id: I9c0c85e40ff7e7be2e9c4122fe5786de3649426c