George Mount
2a25590428
am 209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev
...
* commit '209fb43376989c9a68f947d12bae3ea87e4101d2':
Have the final setVisibility cause a requestLayout.
2015-06-16 20:06:49 +00:00
Mark Salyzyn
2cfdf938b0
am 2b3db144: jni: isLoggable calls __android_log_is_loggable
...
* commit '2b3db1444ab0bb7c2a2d13febb4fa88aebecf74c':
jni: isLoggable calls __android_log_is_loggable
2015-06-16 20:06:38 +00:00
Benjamin Franz
84e38f6878
am dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
...
* commit 'dbc86ad170e2c288f0154a264d12bd6dadf78c45':
Update documentation for PASSWORD_QUALITY_SOMETHING
2015-06-16 20:06:33 +00:00
Clara Bayarri
e979193e48
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
2015-06-16 20:06:28 +00:00
Abodunrinwa Toki
7ebde83a47
am 6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev
...
* commit '6161c5b4cd54036bc4f38455a0c7c11b8201e4a0':
Floating toolbar no longer obstructs the soft keyboard.
2015-06-16 20:06:23 +00:00
Narayan Kamath
2d13fe56ee
am 275294db: Merge "Better systrace slices for application startup." into mnc-dev
...
* commit '275294dbce30eb1f9ef4847d0f9c3d6b602de06c':
Better systrace slices for application startup.
2015-06-16 20:06:19 +00:00
Paul Jensen
8235c839aa
am 19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
...
* commit '19769114b48152efa57527574ee533c8e33db703':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
2015-06-16 20:06:15 +00:00
George Mount
209fb43376
Merge "Have the final setVisibility cause a requestLayout." into mnc-dev
2015-06-16 15:27:27 +00:00
Mark Salyzyn
2b3db1444a
jni: isLoggable calls __android_log_is_loggable
...
(cherry pick from commit 8685a4569d2bdcb1a7361e3d75f832cf3ba9d4b6)
Will inherit additional functionality and cache improvements
Bug: 17760225
Change-Id: Iab1816d37cc74343d83629d851a5784d4865ebb4
2015-06-16 07:10:59 -07:00
Benjamin Franz
dbc86ad170
Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
2015-06-16 13:22:22 +00:00
Clara Bayarri
ec01f3d276
Merge "Add suggested width for Floating Toolbar on large devices" into mnc-dev
2015-06-16 12:41:09 +00:00
Abodunrinwa Toki
6161c5b4cd
Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev
2015-06-16 12:29:55 +00:00
Narayan Kamath
275294dbce
Merge "Better systrace slices for application startup." into mnc-dev
2015-06-16 11:50:57 +00:00
Paul Jensen
19769114b4
Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
2015-06-16 11:30:51 +00:00
Narayan Kamath
fbb32f6440
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
2015-06-16 12:06:31 +01:00
Benjamin Franz
c6a9653e0a
Update documentation for PASSWORD_QUALITY_SOMETHING
...
Add a mention that PASSWORD_QUALITY_SOMETHING includes patterns.
Bug: 20441473
Change-Id: I2608f36e338fb2bfbace80d49ee805841d59fa17
2015-06-16 11:23:38 +01:00
Jeff Sharkey
716978e36b
am 2cc03e56: Yet another user restriction.
...
* commit '2cc03e5606ad7cd473283898400506d5ac2237ba':
Yet another user restriction.
2015-06-16 05:16:54 +00:00
Jeff Sharkey
7f39beb28e
am a65a1582: Merge "Update file size formatting." into mnc-dev
...
* commit 'a65a1582f5a04b15b53ebdec337ac611ccb78a07':
Update file size formatting.
2015-06-16 05:01:43 +00:00
Jeff Sharkey
2cc03e5606
Yet another user restriction.
...
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
2015-06-15 21:50:47 -07:00
Jeff Sharkey
a65a1582f5
Merge "Update file size formatting." into mnc-dev
2015-06-16 04:47:21 +00:00
Jeff Sharkey
b521feaed4
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
2015-06-15 21:39:28 -07:00
Selim Cinek
b4d9e24f06
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
2015-06-16 04:28:37 +00:00
Selim Cinek
892850396c
Merge "Fixed a bug where the statusbar was still visible while dozing" into mnc-dev
2015-06-16 04:16:03 +00:00
Jim Miller
c8b5e94c2b
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
2015-06-16 03:55:59 +00:00
Erik Kline
a01b9e6f43
am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
...
* commit '0d16281a03722f3f66a076718251c2166518d122':
Add a test that Network#getNetworkHandle() behaves sanely.
2015-06-16 03:55:55 +00:00
Selim Cinek
8f2d767f4e
Fixed a bug where the statusbar was still visible while dozing
...
Bug: 18903923
Change-Id: I9c0c85e40ff7e7be2e9c4122fe5786de3649426c
2015-06-15 20:55:04 -07:00
Jim Miller
b1c6208c27
Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
2015-06-16 03:48:58 +00:00
Erik Kline
0d16281a03
Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
2015-06-16 03:43:56 +00:00
Jim Miller
599ef0e3cd
Limit number of fingerprint templates that can be enrolled per device user
...
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account. This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.
Fixes bug 20731847
Change-Id: I5bc337698bef682cdf67940906d24842e1dffc28
2015-06-15 20:42:54 -07:00
Paul Jensen
434dde84ee
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
...
- There are no callers of
NetworkInfo.setIsConnectedToProvisioningNetwork(), so remove all the
code that deals with mIsConnectedToProvisioningNetwork being true,
including the two ConnectiviyManager APIs.
- There are no callers of
ConnectivityManager.getMobileRedirectedProvisioningUrl(), so remove
the code that reads this URL.
- There are no callers of
ConnectivityManager.captivePortalCheckCompleted(), so remove this
API which is currently a no-op.
Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
2015-06-16 02:07:36 +00:00
Daichi Hirono
4e3fb992b7
am 100e1c92: Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev
...
* commit '100e1c9235720ac020a20009da8b85f64efd4c11':
Fix API doc of MtpDevice#getObjectHandles.
2015-06-16 01:38:31 +00:00
Daichi Hirono
100e1c9235
Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev
2015-06-16 01:30:31 +00:00
Adrian Roos
5f6e00d809
am 2bfe9651: Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev
...
* commit '2bfe96513884f0c4a4836a615a80e17a1ba30173':
Fix unnecessairy announcements when collapsing shade
2015-06-16 01:27:35 +00:00
Ruben Brunk
e9a1f181ee
am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev
...
* commit '9a2da54e3c7b5f382d2654eeb5228b945edd8e39':
Add metadata for pre-distortion dimensions.
2015-06-16 01:22:41 +00:00
Christopher Tate
73f2f66ae0
am 60177af8: Merge "Clean up app-link verification policy" into mnc-dev
...
* commit '60177af86aca7712e2e442ca8e39376dad33a545':
Clean up app-link verification policy
2015-06-16 01:22:36 +00:00
Adrian Roos
2bfe965138
Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev
2015-06-16 01:18:01 +00:00
Adrian Roos
54d031bf03
Fix unnecessairy announcements when collapsing shade
...
Bug: 20171694
Change-Id: Iec73098e2f778dac4a920a717385139952017330
2015-06-15 18:17:16 -07:00
Ruben Brunk
9a2da54e3c
Merge "Add metadata for pre-distortion dimensions." into mnc-dev
2015-06-16 01:12:58 +00:00
Christopher Tate
60177af86a
Merge "Clean up app-link verification policy" into mnc-dev
2015-06-16 01:10:48 +00:00
Ruben Brunk
224eb3a4f1
Add metadata for pre-distortion dimensions.
...
Bug: 20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727
2015-06-15 18:09:33 -07:00
Makoto Onuki
2ae1caf984
am e43bf4bb: Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev
...
* commit 'e43bf4bb4511ec756512a44164ff79cce3a02348':
Allow killApplicationWithAppId() on secondary users
2015-06-16 01:00:49 +00:00
Makoto Onuki
e43bf4bb45
Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev
2015-06-16 00:51:36 +00:00
Adam Lesinski
f86b2096e5
am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev
...
* commit 'd5e5151f6ceab498e3a35928c1f6f7a177c1544e':
Bluetooth energy: fix overflow in calculation
2015-06-16 00:48:29 +00:00
Adrian Roos
7383bf334d
am d719215f: Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev
...
* commit 'd719215fed261b41ae29acf87faef00f76c8faa7':
Fix accessibility ghosts in quick settings detail
2015-06-16 00:48:24 +00:00
Adam Lesinski
d5e5151f6c
Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev
2015-06-16 00:46:09 +00:00
Adrian Roos
d719215fed
Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev
2015-06-16 00:35:12 +00:00
Makoto Onuki
fa24bd8ab6
Allow killApplicationWithAppId() on secondary users
...
Bug 20949609
Change-Id: If0e766aeb3e8b4aa6aebed3b75bcedd75251e382
2015-06-15 17:32:00 -07:00
Adrian Roos
d366cb130d
Fix accessibility ghosts in quick settings detail
...
Fixes a bug where the tile that was just clicked on
to go to the detail view would become visible and cause
confusion to accessibility services.
Bug: 20209718
Change-Id: I1678a4fc35e8d739b7c657e868b02a25eddcba1d
2015-06-15 17:28:37 -07:00
Adam Lesinski
8a35137388
Bluetooth energy: fix overflow in calculation
...
Use longs instead of ints, because the energy values can get pretty
high.
Change-Id: I43e696ad9e5965c2e616b11920db5bfae5db1671
2015-06-15 17:19:07 -07:00
Junda Liu
b7f9e8a44d
am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev
...
* commit '73d043232434f3ad37af26615919eac3117536b7':
Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
2015-06-16 00:00:50 +00:00