Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,497 Commits 3 Branches 0 Tags
ffe7746437e8f06cc7dd2571c3354973791c8a8a
Commit Graph

246497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
21acc0c403 Merge "ActivityManager: Make bootcomplete marker failure a warning" into nyc-dev 
am: 65e22a20ac

* commit '65e22a20acd50876602f25b9b607aeea57682971':
  ActivityManager: Make bootcomplete marker failure a warning

Change-Id: Ic9ee4c8f5de567debb4a34c8a4dc5fbb075e37dd
 2016-05-03 18:29:37 +00:00
Chris Tate
44b28493ca Merge "Always log web link filter verification parameters" into nyc-dev 2016-05-03 18:27:36 +00:00
TreeHugger Robot
65e22a20ac Merge "ActivityManager: Make bootcomplete marker failure a warning" into nyc-dev 2016-05-03 18:26:50 +00:00
Ajay Panicker
2f78bf96d2 List the CONNECTION_STATE_CHANGED broadcast for MAP as protected 
Bug: 28527879
Change-Id: Ifb2db87677e92022814bb9704c26009d249ac6ce
 2016-05-03 11:24:13 -07:00
Abodunrinwa Toki
610953d3cf Merge "Fix FloatingToolbar popup positioning." into nyc-dev 
am: 344d23c0fa

* commit '344d23c0fadd9714453a2bfdebf1d1b304105acf':
  Fix FloatingToolbar popup positioning.

Change-Id: Ia5eaf524d69e1ab92ec35398be7cd5705412279d
 2016-05-03 18:22:38 +00:00
Abodunrinwa Toki
344d23c0fa Merge "Fix FloatingToolbar popup positioning." into nyc-dev 2016-05-03 18:19:42 +00:00
Jason Monk
42d0121441 Add action to launch webview implementation settings 
Bug: 28554048
Change-Id: I5ccdf5350c216949890d79b2b306b935a5949824
 2016-05-03 14:16:56 -04:00
Felipe Leme
d56b75987d Merge "Added option to reset network policies for a given user." into nyc-dev 
am: 28309fec2f

* commit '28309fec2f104e181c22ab03ba3cec7f8756e4b7':
  Added option to reset network policies for a given user.

Change-Id: I53bc2a1add1b6df8b515600517febbff6a40e678
 2016-05-03 18:13:24 +00:00
Todd Kennedy
ffe4fcbfcb Don't pre-opt shims 
There's no code, so, no need to pre-opt the shims
Bug: 28398205

Change-Id: Ie7d33a59fafe963a6d60fa645d580fe1d770aba6
 2016-05-03 11:11:39 -07:00
TreeHugger Robot
28309fec2f Merge "Added option to reset network policies for a given user." into nyc-dev 2016-05-03 18:08:35 +00:00
Ajay Panicker
9e35b71428 List the SDP_RECORD broadcast as protected 
am: 65fad18461

* commit '65fad18461b64ac35bf65e463e7f792c6df72add':
  List the SDP_RECORD broadcast as protected

Change-Id: I8fe34d0639b408ff21338a7934c1aa76afcdc725
 2016-05-03 17:47:37 +00:00
Adam Lesinski
a8018ac47a BatteryStats: Fix units on battery charge counter 
The unit for the battery charge counter is in micro-Ampere-hours, not coulombs.
We store the value as uAh but display it in dumpsys as mAh.

Bug:27174034
Change-Id: Ib5cc1ee1c5c191336a3e1f18dbb12c38e833f8d0
 2016-05-03 10:41:47 -07:00
Hal Canary
424784d60e stop leaking SkPDFDocument 
bug: 28520971

Change-Id: I0fffde4bfa0aa8fe716e5ee2fc95a00b5c824e2f
 2016-05-03 13:41:15 -04:00
Ajay Panicker
65fad18461 List the SDP_RECORD broadcast as protected 
Bug: 28257589
Change-Id: I97ef91fa3a7f7ef62fd96ca079e0a6d5a957bc71
 2016-05-03 17:32:57 +00:00
Chong Zhang
3765b399ce Merge "Fix bad animation when pressing Home with translucent activity" into nyc-dev 
am: c70e264de1

* commit 'c70e264de102a1e1a4b77018bcc4eded08d4b254':
  Fix bad animation when pressing Home with translucent activity

Change-Id: I18d0d0f09e68fe1db70c0edc511eac1cba222d53
 2016-05-03 17:32:00 +00:00
Chong Zhang
c70e264de1 Merge "Fix bad animation when pressing Home with translucent activity" into nyc-dev 2016-05-03 17:28:38 +00:00
Dirk Dougherty
f2507b10b8 Fix stray char in metadata file. am: 4852cb74fc am: aa723591cf am: 4a4fda6416 
am: 3ff6495ca6

* commit '3ff6495ca65c8304b7ef22f6e1200233f986dbc8':
  Fix stray char in metadata file.

Change-Id: Iea364a92b68ff6e5da04271d5b1117d39fc6258a
 2016-05-03 17:26:45 +00:00
Dirk Dougherty
3ff6495ca6 Fix stray char in metadata file. am: 4852cb74fc am: aa723591cf 
am: 4a4fda6416

* commit '4a4fda64166d47328b23c8c89da3600dc7792cc6':
  Fix stray char in metadata file.

Change-Id: Idd76ac02c6fc3387c9c679cd43bf71595aed7327
 2016-05-03 17:24:19 +00:00
Dirk Dougherty
4a4fda6416 Fix stray char in metadata file. am: 4852cb74fc 
am: aa723591cf

* commit 'aa723591cf8d6e9dc351c06043c48858710f2b4d':
  Fix stray char in metadata file.

Change-Id: I9ff9158240d14496829399420175efec04e89f6b
 2016-05-03 17:21:54 +00:00
Dirk Dougherty
aa723591cf Fix stray char in metadata file. 
am: 4852cb74fc

* commit '4852cb74fca59e2c67c7f2e53cb318a9a29e6160':
  Fix stray char in metadata file.

Change-Id: I301ef3271adea553e0e6274ca6996af3dc8b5b5b
 2016-05-03 17:19:32 +00:00
Vladislav Kaznacheev
7e4669c5a6 Fix typos in ClipData JavaDoc 
Also removed the obsolete text regarding iconic representation
and fixed some whitespace.

Bug: 28536304
Change-Id: I55ca681b86a121018903a41fff228e7c6126c7e7
 2016-05-03 10:09:06 -07:00
Dirk Dougherty
4852cb74fc Fix stray char in metadata file. 
Change-Id: I4a11125f2540fbc3204850e87ca74c11e63754c5
 2016-05-03 10:07:27 -07:00
Joe Fernandez
6fb1d7530b docs: May 2016 Dashboard update am: a018241fd4 am: 4437aa614a am: af85149493 am: bae3ec6fc9 
am: 3e596249a2

* commit '3e596249a2c841f0e55b1ab4b320edd0fe150138':
  docs: May 2016 Dashboard update

Change-Id: I0c56351c20fc926f5a7360fe95bdb884c9298c78
 2016-05-03 17:02:09 +00:00
Joe Fernandez
3e596249a2 docs: May 2016 Dashboard update am: a018241fd4 am: 4437aa614a am: af85149493 
am: bae3ec6fc9

* commit 'bae3ec6fc9551a9c3b84c5302911c5a9246bbced':
  docs: May 2016 Dashboard update

Change-Id: I9b9c35e109861ce875ee3363bab39307e37bbf84
 2016-05-03 16:59:43 +00:00
Joe Fernandez
bae3ec6fc9 docs: May 2016 Dashboard update am: a018241fd4 am: 4437aa614a 
am: af85149493

* commit 'af85149493bc9d00a34c9cb35dc0ae562242a47e':
  docs: May 2016 Dashboard update

Change-Id: I15942066a923da822e4a27a08a8f4000bfc8c95b
 2016-05-03 16:57:02 +00:00
Dirk Dougherty
697c5995e7 Merge "Add metadata for Android Studio card and point the landing/primary collection at it." into mnc-mr-docs am: 1516bf2cd4 am: 145ca75e17 am: 42e9230547 
am: c9b3b13f4a

* commit 'c9b3b13f4af317a76e30e8859f3faf836b733534':
  Add metadata for Android Studio card and point the landing/primary collection at it.

Change-Id: Ia978bbd67ceb382a408233421aa8da7110708cee
 2016-05-03 16:54:47 +00:00
Joe Fernandez
ada0b50d6f docs: May 2016 Dashboard update am: ae5c8a9f4a am: b46a079a16 am: 250376bfad 
am: cf69f3887b

* commit 'cf69f3887b7be9433eca259ecf72e26629a902ee':
  docs: May 2016 Dashboard update

Change-Id: I631080b107c8a301736a2bfb58fa61b7a2e40239
 2016-05-03 16:54:44 +00:00
Joe Fernandez
af85149493 docs: May 2016 Dashboard update am: a018241fd4 
am: 4437aa614a

* commit '4437aa614a708cffe7bf9450e07a973ca2116ecb':
  docs: May 2016 Dashboard update

Change-Id: Ie9ba257526093b00d8e5591189c95591d9288f7d
 2016-05-03 16:54:21 +00:00
Dirk Dougherty
c9b3b13f4a Merge "Add metadata for Android Studio card and point the landing/primary collection at it." into mnc-mr-docs am: 1516bf2cd4 am: 145ca75e17 
am: 42e9230547

* commit '42e9230547579444171f5595928886cfda88746f':
  Add metadata for Android Studio card and point the landing/primary collection at it.

Change-Id: Ic1594415171b5e94e06d201496349baf3e708b27
 2016-05-03 16:51:57 +00:00
Joe Fernandez
cf69f3887b docs: May 2016 Dashboard update am: ae5c8a9f4a am: b46a079a16 
am: 250376bfad

* commit '250376bfadff5f34292f44625539e90884a2d9aa':
  docs: May 2016 Dashboard update

Change-Id: I46534a2eba5b80225d0fa721b0c1c61f180f3c1b
 2016-05-03 16:51:52 +00:00
Doris Liu
eae82375fd Merge "Count native allocation for VD against Java heap" into nyc-dev 
am: 6543533f29

* commit '6543533f29d869d5cbbc1c403e4e0ed219fcc300':
  Count native allocation for VD against Java heap

Change-Id: I9ee0f11a09140e15b412a635fae6c08c5404d96f
 2016-05-03 16:51:42 +00:00
Baligh Uddin
9110c77b42 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 13f9b39882  -s ours

* commit '13f9b398824b67be1f568c87f5595ad3e1d3085f':
  Import translations. DO NOT MERGE

Change-Id: I1152c80ae5b7baf55c2aebf48a8257afa84dcc2e
 2016-05-03 16:51:40 +00:00
Joe Fernandez
4437aa614a docs: May 2016 Dashboard update 
am: a018241fd4

* commit 'a018241fd484fca9e169c8ba03fcb8cf22f37a77':
  docs: May 2016 Dashboard update

Change-Id: Id67fa36ed012d001916da1556ae5a9adb75379f1
 2016-05-03 16:51:33 +00:00
Dirk Dougherty
42e9230547 Merge "Add metadata for Android Studio card and point the landing/primary collection at it." into mnc-mr-docs am: 1516bf2cd4 
am: 145ca75e17

* commit '145ca75e17473232ca99ddef0582af2b43a54c64':
  Add metadata for Android Studio card and point the landing/primary collection at it.

Change-Id: I59cccb47a38628feb3d05b533fe6e464825578cc
 2016-05-03 16:46:46 +00:00
Joe Fernandez
250376bfad docs: May 2016 Dashboard update am: ae5c8a9f4a 
am: b46a079a16

* commit 'b46a079a16fd10c5926ac5ce9489d1d10b752e14':
  docs: May 2016 Dashboard update

Change-Id: I0162a357306dcd7dd273efc8c96ba9bb106e9b9e
 2016-05-03 16:46:43 +00:00
Android Build Merger (Role)
9c0ec1fe3f Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 94942bb070 -s ours" into nyc-mr1-dev 2016-05-03 16:42:57 +00:00
Android Build Merger (Role)
4aeebb0b1f Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 26c1e22e29 -s ours" into nyc-mr1-dev 2016-05-03 16:42:42 +00:00
Android Build Merger (Role)
e25ec60c3c Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: b26da96c2c -s ours" into nyc-mr1-dev 2016-05-03 16:42:31 +00:00
Baligh Uddin
b7548188ae Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 94942bb070  -s ours

* commit '94942bb0707cdf1430d0cd83909ad2ce87ea5f5d':
  Import translations. DO NOT MERGE

Change-Id: Iefa14933fd9761e914207ff987c53cd72adfd2b3
 2016-05-03 16:41:39 +00:00
Baligh Uddin
6474fa7d3b Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 26c1e22e29  -s ours

* commit '26c1e22e294697a2b1494e95a1b66639923c5679':
  Import translations. DO NOT MERGE

Change-Id: I57b5810b88baf614ab4558a1b71e5a95286905ea
 2016-05-03 16:41:36 +00:00
Dirk Dougherty
145ca75e17 Merge "Add metadata for Android Studio card and point the landing/primary collection at it." into mnc-mr-docs 
am: 1516bf2cd4

* commit '1516bf2cd4f8264bac546e1c84d2369d8489f3ce':
  Add metadata for Android Studio card and point the landing/primary collection at it.

Change-Id: I9fe4bc056bfd61181895b88928fa91c20fcb74da
 2016-05-03 16:41:33 +00:00
Baligh Uddin
a83a819958 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: b26da96c2c  -s ours

* commit 'b26da96c2c63008892f0c556c8f9bc3c0e374db6':
  Import translations. DO NOT MERGE

Change-Id: I2bc0a2af6955a83486949395faf1b627b84ca371
 2016-05-03 16:41:33 +00:00
Joe Fernandez
b46a079a16 docs: May 2016 Dashboard update 
am: ae5c8a9f4a

* commit 'ae5c8a9f4aec1fb7368736f88db732caa8e45066':
  docs: May 2016 Dashboard update

Change-Id: I58e8e84d988db7e150f4a4af44f2d68f1cef4bda
 2016-05-03 16:41:31 +00:00
Doris Liu
6543533f29 Merge "Count native allocation for VD against Java heap" into nyc-dev 2016-05-03 16:41:20 +00:00
Baligh Uddin
096ea4c897 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-03 16:41:17 +00:00
Baligh Uddin
13f9b39882 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-03 16:41:15 +00:00
Dirk Dougherty
1516bf2cd4 Merge "Add metadata for Android Studio card and point the landing/primary collection at it." into mnc-mr-docs 2016-05-03 16:39:20 +00:00
Joe Fernandez
a018241fd4 docs: May 2016 Dashboard update 
Change-Id: I74831ac0edb3b093665aca267a9ead1d72f4ec04
 2016-05-03 16:38:37 +00:00
Andreas Gampe
0e11a4cd9d ActivityManager: Make bootcomplete marker failure a warning 
This isn't terminal, and currently even expected in some cases.
Make it a warning instead of an error.

Bug: 26978865
Change-Id: Ieb7f29e340f5b08f69887b9f094554858fb72786
 2016-05-03 09:38:31 -07:00
Android Build Merger (Role)
59cfcb502d Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev 2016-05-03 16:37:29 +00:00