Dianne Hackborn
3ffc0f1e81
am 81f3a85a: Merge "Fix issue #22940169 : "pm grant" can no longer grant permissions..." into mnc-dev
...
* commit '81f3a85aa29d83ed1a5de4de1006587d375a1c77':
Fix issue #22940169 : "pm grant" can no longer grant permissions...
2015-08-14 17:15:10 +00:00
Dianne Hackborn
81f3a85aa2
Merge "Fix issue #22940169 : "pm grant" can no longer grant permissions..." into mnc-dev
2015-08-14 17:06:20 +00:00
Svetoslav Ganov
03e64e4edd
am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
...
* commit 'b045331fcb033507072bfd7899a147bb2be7176e':
Add GTS test to ensure valid default permission grants - framework
2015-08-14 15:12:06 +00:00
Svetoslav Ganov
b045331fcb
Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
2015-08-14 15:06:16 +00:00
Dianne Hackborn
9f5b0a2735
Fix issue #22940169 : "pm grant" can no longer grant permissions...
...
...with protection flag PROTECTION_FLAG_DEVELOPMENT
Bring back the old grant/revoke code for development permissions.
Also some more dumpsys output to help debugging.
And new dumpsys command for checking a permission.
Change-Id: I6e27e62a9ca5ec1ecc0f102714a448ea02f0f41c
2015-08-13 18:25:20 -07:00
Jeff Sharkey
b53738f71e
am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
...
* commit 'cfcf6af915bee878bdaea04f48592bbbe506ad26':
Method to show DialogFragment allowing state loss.
2015-08-14 01:24:36 +00:00
Joe Fernandez
619bbdf4a9
am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
...
* commit '37dd5240ad54494e028d6b2973729f5cb40ccad9':
Doc change: Update preview pages for dp3.
2015-08-14 01:18:56 +00:00
Jeff Sharkey
cfcf6af915
Merge "Method to show DialogFragment allowing state loss." into mnc-dev
2015-08-14 01:18:18 +00:00
Joe Fernandez
37dd5240ad
Merge "Doc change: Update preview pages for dp3." into mnc-dev
2015-08-14 01:10:56 +00:00
Jorim Jaggi
8de9d44583
am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
...
* commit '81eeef589386483722c21572d9ab6d3f95dd26be':
Update time when turning on screen, in addition to waking up
2015-08-13 23:57:55 +00:00
Jeff Sharkey
063f850060
Method to show DialogFragment allowing state loss.
...
Same as show(), but allowing state loss.
Bug: 22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
2015-08-13 16:57:29 -07:00
Jorim Jaggi
81eeef5893
Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
2015-08-13 23:51:11 +00:00
Jorim Jaggi
9373911d41
Update time when turning on screen, in addition to waking up
...
When in ambient display mode, we didn't get a callback to
onStartedWakingUp, thus the time was never refreshed. Since
broadcasts are disabled in this low-power state, we need to refresh
the clock manually before turning on the screen, because we can't
rely on the broadcasts to be delivered.
Bug: 23171638
Change-Id: I249f4195a14995f7c1467e73ac2aa400b871f80e
2015-08-13 15:56:41 -07:00
Joe Fernandez
c245093f96
am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
...
* commit 'f75577295765ca13bf3d0d5bffa81b569cb88da2':
docs: Update uses-sdk-element page with API 23 (M) listing
2015-08-13 18:56:43 +00:00
Joe Fernandez
f755772957
Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
2015-08-13 18:49:40 +00:00
Joe Fernandez
901f807143
docs: Update uses-sdk-element page with API 23 (M) listing
...
Change-Id: If579411c66f3cfc02b270a04b266fe7562b48e14
2015-08-13 11:45:23 -07:00
Joe Fernandez
9f65f0a2c0
am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
...
* commit '8d149d7ff278c877bf7ccff7cc428cf7ba1db1e4':
docs: Update developer docs make file to include API 23
2015-08-13 18:33:58 +00:00
Joe Fernandez
8d149d7ff2
Merge "docs: Update developer docs make file to include API 23" into mnc-dev
2015-08-13 18:27:11 +00:00
Dirk Dougherty
2906bd5cb3
Doc change: Update preview pages for dp3.
...
Change-Id: If4a3beab28cc2114cf01a2d6202dc072768960fc
2015-08-13 10:54:50 -07:00
Mike Dodd
93eef42349
am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '226ae04df4b3570d11b66d52a404b2c8b2ac50db':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-13 15:21:53 +00:00
Mike Dodd
226ae04df4
Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
2015-08-13 15:16:39 +00:00
Jason Monk
692e9b3404
am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
...
* commit '90460c79d1af214e73428eac92b5761e743dec4d':
Add more intelligence to bluetooth connection state
2015-08-13 14:45:42 +00:00
Jason Monk
90460c79d1
Merge "Add more intelligence to bluetooth connection state" into mnc-dev
2015-08-13 14:38:46 +00:00
Bart Sears
48ce6d2701
am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
...
* commit 'bd29b07eab3956796a7a09d7612e42e22616f458':
Fix Keyguard drawn timeout
2015-08-13 06:58:47 +00:00
Bart Sears
bd29b07eab
Merge "Fix Keyguard drawn timeout" into mnc-dev
2015-08-13 05:32:14 +00:00
Svet Ganov
52153f4c05
Add GTS test to ensure valid default permission grants - framework
...
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.
bug:23043018
Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
2015-08-12 21:57:59 -07:00
Joe Fernandez
1827e3230d
docs: Update developer docs make file to include API 23
...
Change-Id: I1bb9c37cafdfc7c78c23099a0fde2914f3068485
2015-08-12 19:45:22 -07:00
Dianne Hackborn
6d52d7616d
am ff9912d5: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 00:57:51 +00:00
Dianne Hackborn
ff9912d594
Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:59 +00:00
Jeff Sharkey
259198343b
am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev
...
* commit 'c97509c0292910d7fb27e4c890ad4bc0ea723fec':
Update ifaces when global restriction changes.
2015-08-13 00:43:12 +00:00
Nick Kralevich
715bb2f64b
am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."
...
* commit 'f3ae260367235e325adce10c9aadddfe8a3107c1':
SELinuxPolicyInstallReceiver: Switch to file_contexts.bin.
2015-08-13 00:40:30 +00:00
Nick Kralevich
f3ae260367
am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."
...
* commit '10e0f07975e6e446763b733bb438df5715c3693d':
SELinuxPolicyInstallReceiver: Switch to file_contexts.bin.
2015-08-12 23:57:58 +00:00
Jeff Sharkey
c97509c029
Merge "Update ifaces when global restriction changes." into mnc-dev
2015-08-12 23:51:55 +00:00
Nick Kralevich
10e0f07975
Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."
2015-08-12 23:46:28 +00:00
Jeff Sharkey
9d14206594
Update ifaces when global restriction changes.
...
Global restriction of background data only applies to metered
interfaces, but battery saver applies to all interfaces. In the
very specific case where global background had been turned on while
battery saver was enabled, we'd end up with a stale battery saver
rule floating around.
This change triggers an update of iface rules when the global
restriction changes, giving us consistent behavior.
Bug: 23098198
Change-Id: I454dc71cf11d50a2e9e6122e8a801ff17039b43a
2015-08-12 16:46:05 -07:00
Andreas Gampe
3255e2f961
Merge "Hwui: Remove unused variables" into mnc-dev-plus-aosp
2015-08-12 23:31:25 +00:00
Andreas Gampe
fea85a33b7
Hwui: Remove unused variables
...
For build-system CFLAGS clean-up, remove unused variables.
Bug: 18632512
(cherry picked from commit cb4af9b10ab17187288d8f5ccb4cc1e465be9a51)
Change-Id: Ic58bedc84234325512193991fc64315e3aad6f9e
2015-08-12 16:30:32 -07:00
Elliott Hughes
17b4be07fe
am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
...
* commit '39669d7f6b8fedef3468ab3d417c93a21df528af':
Lose HAVE_ANDROID_OS from frameworks/base.
2015-08-12 23:21:56 +00:00
Dianne Hackborn
c3f7449517
Fix issue #23116383 : Include security patch level in Settings
...
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
2015-08-12 16:10:58 -07:00
Mike Dodd
4ec593928e
Set default SMS/MMS app to com.android.messaging (new AOSP app).
...
b/23110861
Change-Id: Ifcdcfdea4d19875bf32ec19d245abc5e5a582b4c
2015-08-12 15:44:05 -07:00
Elliott Hughes
39669d7f6b
am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
...
* commit '6fdc633380bb4744595575449101ee171b690175':
Lose HAVE_ANDROID_OS from frameworks/base.
2015-08-12 22:31:01 +00:00
Elliott Hughes
6fdc633380
Merge "Lose HAVE_ANDROID_OS from frameworks/base."
2015-08-12 22:21:46 +00:00
Elliott Hughes
ba3fe56edc
Lose HAVE_ANDROID_OS from frameworks/base.
...
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
2015-08-12 14:49:53 -07:00
Raph Levien
9dc2d5cd5b
am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
...
* commit 'beabcb92cbdec6f68bd712c9972e6f8377b78f46':
Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:08:13 +00:00
Raph Levien
beabcb92cb
Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
2015-08-12 21:00:07 +00:00
Jason Monk
bba7317d07
Add more intelligence to bluetooth connection state
...
Since bluetooth connection state has a mind of its own... If we
think we are connected, but we don't actually know about any devices
that are currently connected, we probably aren't. So set the state
that way, and let everyone know.
Bug: 22977827
Change-Id: I9266f5394b179a3917b3818839f7c6b2dc238376
2015-08-12 16:17:34 -04:00
Eino-Ville Talvala
09c62671e9
am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
...
* commit '242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 20:12:35 +00:00
Clara Bayarri
f95ed10d9d
Fix Insertion ActionMode not showing on RTL languages
...
When long pressing on an empty Text field with the system language set
to RTL, the "paste" popup was not showing up.
The Floating Toolbar requires a content rect to determine where the
text is and place itself close to it. In the case of an empty field,
we create a "fake" content rect by taking the placement of the cursor
+1 pixel to the right. In RTL languages, this +1 causes the content
rect to be considered off the bounds of the view, as the cursor is
aligned to the right, and hence the Floating Toolbar is hidden.
After making the rect a 0 width rect, we ran into the issue that
it was considered out of bounds due to the calculation ignoring rects
that simply touch the edge of the view's bounds.
BUG: 22540083
Change-Id: I29c79b701f586970b2611178233eff082b802ec1
2015-08-12 21:03:28 +01:00
Eino-Ville Talvala
242ff8a89d
Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
2015-08-12 20:01:44 +00:00
Mike Dodd
fdc169c1b0
am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
...
* commit 'ad285c169fd55bee8feef6e076a6710c357043e5':
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
2015-08-12 18:59:00 +00:00