drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
263,471 Commits 1 Branch 0 Tags
Commit Graph

263471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
af22260f5d Merge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a48b 
am: 5710e91931

Change-Id: I1a4957ded3e3526df8b2bb36093b70cee3f8c065
 2016-07-18 13:33:04 +00:00
Julia Reynolds
5710e91931 Merge \"Check uid for notification policy access.\" into nyc-dev 
am: 8f17d2a48b

Change-Id: Iade2316b64a8d6dc43636fb292c08dbf82c9dc59
 2016-07-18 13:25:54 +00:00
Julia Reynolds
8f17d2a48b Merge "Check uid for notification policy access." into nyc-dev 2016-07-18 13:16:16 +00:00
Abodunrinwa Toki
c749762107 Merge \"FloatingActionMode: Fix screen coordinates.\" into nyc-mr1-dev 
am: 3b8e0fdf92

Change-Id: If193932cfe4b79535ba8d2ce44f144899e81ee4e
 2016-07-17 18:20:11 +00:00
Abodunrinwa Toki
3b8e0fdf92 Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev 2016-07-17 18:07:09 +00:00
Tim Murray
62547293e3 Merge \"Make sure StrictMode allows disk reads when calling isThreadInProcess.\" into nyc-mr1-dev 
am: afa67f3d34

Change-Id: I2b3afb4acb9038a2d33ecf42bbbcc8c5d754ab5f
 2016-07-16 19:25:37 +00:00
Tim Murray
afa67f3d34 Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev 2016-07-16 19:14:30 +00:00
Tim Murray
9bc12a83b6 Make sure StrictMode allows disk reads when calling isThreadInProcess. 
If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.

bug 30170339

Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1
 2016-07-16 11:48:01 -07:00
Adam Lesinski
6a9f651b73 Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc-mr1-dev 
am: c3829f528e

Change-Id: I59c4daf39179409cc3195cda9c89ae604ec36af6
 2016-07-16 02:38:24 +00:00
Andreas Gampe
46d5eca989 Frameworks/base: Fix braino missing line 
am: 06eb24d95e

Change-Id: I34b1b3084da32be43fda62d23c0b955e3cc6f335
 2016-07-16 02:38:18 +00:00
TreeHugger Robot
c3829f528e Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev 2016-07-16 02:33:55 +00:00
Andreas Gampe
06eb24d95e Frameworks/base: Fix braino missing line 
This got accidentally deleted in cleanup.

Bug: 29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb
 2016-07-15 18:13:48 -07:00
Adam Lesinski
aa19d5e49e Deprecate Resources constructor and updateConfiguration() method 
These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().

Bug:30088019
Bug:29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a
 2016-07-15 18:01:48 -07:00
Android Build Merger (Role)
4eb66d1d4b Merge "Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207 am: 72022a691a" into nyc-mr1-dev-plus-aosp 2016-07-16 00:41:57 +00:00
Andrew Solovay
45368cd044 Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207 
am: 72022a691a

Change-Id: I4c85652bbc4d67507c419b5362341e993f932866
 2016-07-16 00:41:33 +00:00
Andrew Solovay
7097984ba5 Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207 
am: 8af870a778

Change-Id: I257e7b0774f7892373963883a362b44ba5ec4759
 2016-07-16 00:41:16 +00:00
Andrew Solovay
72022a691a Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev 
am: 9d3bc86207

Change-Id: Iede90cc135476ea34b82f49c464a14eba9d60a31
 2016-07-16 00:35:41 +00:00
Andrew Solovay
8af870a778 Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev 
am: 9d3bc86207

Change-Id: I21af2f098ffd3034b3f88548bfa9210996f7b397
 2016-07-16 00:35:31 +00:00
Android Build Merger (Role)
f00bbba326 Merge "Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049 am: f5f50cfc7a" into nyc-mr1-dev-plus-aosp 2016-07-16 00:30:15 +00:00
Andrew Solovay
d8333334f8 Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049 
am: f5f50cfc7a

Change-Id: Icc3d60d6ad55805be520975033e2a0f157721c50
 2016-07-16 00:29:49 +00:00
Andrew Solovay
3cbde13f9e Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049 
am: 843979a3b3

Change-Id: I9a86bd40709f5a9006f669cbdbd94d10bfd8d555
 2016-07-16 00:28:26 +00:00
TreeHugger Robot
9d3bc86207 Merge "docs: Updating N Preview "behavior changes" doc for DP5" into nyc-dev 2016-07-16 00:24:49 +00:00
Andrew Solovay
f5f50cfc7a Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev 
am: 833722e049

Change-Id: Id869d494381ff6e53066eab1dcbb4a3ee447384d
 2016-07-16 00:23:00 +00:00
Andrew Solovay
843979a3b3 Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev 
am: 833722e049

Change-Id: I8b594c2f28db69dd6e645dc2d79405f6da764806
 2016-07-16 00:22:59 +00:00
TreeHugger Robot
833722e049 Merge "docs: Updating N Preview "API Overview" doc for DP5" into nyc-dev 2016-07-16 00:13:17 +00:00
Amith Yamasani
d0cecf9d67 Merge \"Block camera gesture during secondary user SUW\" into nyc-mr1-dev 
am: e1a3a449a4

Change-Id: I92755956d3047902086945ce7479fc16bfa70b84
 2016-07-16 00:12:03 +00:00
Steve McKay
a8387db55e Merge \"Include an app icon.\" into nyc-mr1-dev 
am: 3d8c9981b5

Change-Id: I14f2d90fc7c0f21ab0fe6b993c1ef6d8ed665831
 2016-07-16 00:06:10 +00:00
TreeHugger Robot
e1a3a449a4 Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev 2016-07-16 00:03:52 +00:00
TreeHugger Robot
3d8c9981b5 Merge "Include an app icon." into nyc-mr1-dev 2016-07-15 23:59:46 +00:00
Doris Liu
f5b87ce908 Merge \"Ensure native allocation/free is correctly registered\" into nyc-mr1-dev 
am: a7272b4cad

Change-Id: Ib1d07a6420d6800b290d0c47e9fcfe3690c541eb
 2016-07-15 23:56:24 +00:00
Makoto Onuki
3d3e2e2b17 Merge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev 
am: 6fa0e4d518

Change-Id: I8bc05f17694aca0c24e280daa2fcd8464aa1fd05
 2016-07-15 23:50:51 +00:00
Doris Liu
a7272b4cad Merge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev 2016-07-15 23:46:08 +00:00
Makoto Onuki
6fa0e4d518 Merge "Don't accept resource references in string fields" into nyc-mr1-dev 2016-07-15 23:41:11 +00:00
Android Build Merger (Role)
40a4bf7dc1 Merge "Merge \"Build both filename views before deleting.\" into nyc-mr1-dev am: fff6a11438" into nyc-mr1-dev-plus-aosp 2016-07-15 23:16:57 +00:00
Jeff Sharkey
ab062fc81f Merge \"Build both filename views before deleting.\" into nyc-mr1-dev 
am: fff6a11438

Change-Id: Ie97bade1f8396c3c08f622f2533d42d115568e08
 2016-07-15 23:16:35 +00:00
Andrew Solovay
64c147b2cd Merge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am: b91693fedd 
am: 5de36f1ba0

Change-Id: Ib60985ae93a52c826a75c96df6b8d2d50d448ad4
 2016-07-15 23:15:57 +00:00
Andrew Solovay
91eaa3ec0e Merge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am: b91693fedd 
am: e4846ae107

Change-Id: I81bb81225087441a2906b36a67ad68b247b36fb0
 2016-07-15 23:10:58 +00:00
TreeHugger Robot
fff6a11438 Merge "Build both filename views before deleting." into nyc-mr1-dev 2016-07-15 23:05:15 +00:00
Andrew Solovay
469f8a5c80 docs: Updating N Preview "behavior changes" doc for DP5 
See first comment for doc stage location.

Change-Id: I11720bdabca78fdbaca82c7e3467f47b51e60f15
 2016-07-15 16:01:37 -07:00
Andrew Solovay
5de36f1ba0 Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev 
am: b91693fedd

Change-Id: I2e697679697d56695bd6e26eeb4ff2dba58632d1
 2016-07-15 22:55:38 +00:00
Andrew Solovay
e4846ae107 Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev 
am: b91693fedd

Change-Id: I9e9a0982a141d09da5e7d68fb01df48adcb619a3
 2016-07-15 22:55:37 +00:00
Android Build Merger (Role)
8ff25378a0 Merge "Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b am: 64e25cf4d3" into nyc-mr1-dev-plus-aosp 2016-07-15 22:52:03 +00:00
Andrew Solovay
35f6be5014 Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b 
am: 64e25cf4d3

Change-Id: Ia118a84d08bfd049036e8a8dba107213f4732ca7
 2016-07-15 22:51:27 +00:00
Andrew Solovay
3b6d0481c0 Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b 
am: 9ef754c105

Change-Id: Ia924b34cae241e95ba4354ebb795fd2003ba392a
 2016-07-15 22:51:20 +00:00
Andrew Solovay
b91693fedd Merge "docs: Updating N Preview release notes for DP5" into nyc-dev 2016-07-15 22:46:51 +00:00
Andrew Solovay
9ef754c105 Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev 
am: 085b4e8f7b

Change-Id: I9a005cea1e0e3b61d20003ebb975d4b04ebdba5c
 2016-07-15 22:46:14 +00:00
Andrew Solovay
64e25cf4d3 Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev 
am: 085b4e8f7b

Change-Id: Id0ad00358c59e0a4187bd1f67bfc329e328c17bd
 2016-07-15 22:45:57 +00:00
TreeHugger Robot
085b4e8f7b Merge "docs: Describe how to update N Preview test devices on N release" into nyc-dev 2016-07-15 22:42:28 +00:00
Andrew Solovay
1721c3e7fa docs: Updating N Preview "API Overview" doc for DP5 
Added new "WebView" section, and minor tweak to the "Always On VPN"
section.

See first comment for doc stage location.

Change-Id: I1f57c2a73d1c8adaf4de0bf928711ba75f732436
 2016-07-15 15:38:22 -07:00
Steve McKay
f00c161a22 Include an app icon. 
Bug: 29880363
Change-Id: Ia8d9414ce536fb35acec1357d0f69d3ee158d853
 2016-07-15 15:37:14 -07:00