Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
4d628b86e4 Merge "Build JobStatus objects outside the lock" into nyc-dev 
am: 87ad1fce25

* commit '87ad1fce254bdb398c5a33753f0368a596fd81f0':
  Build JobStatus objects outside the lock

Change-Id: I91f11f9de40e5d8cfa8c5619796dedd56c490eb5
 2016-05-31 18:42:03 +00:00
sreevanis
2cbac3c122 Updated image sizes and wrapped text around images. 
am: 1ce2279423

* commit '1ce2279423a544d431bf6b64f2bfeb1a4617120b':
  Updated image sizes and wrapped text around images.

Change-Id: I61e1bb43a0b32ca80e0875e375c746fc930c85cb
 2016-05-31 18:39:38 +00:00
Chris Tate
87ad1fce25 Merge "Build JobStatus objects outside the lock" into nyc-dev 2016-05-31 18:36:49 +00:00
Vasco Brito
c21130f33d Merge "Add 900 for Russia - Short code used by Sberbank." am: 9a769a4828 am: 29760d459a am: ef0ab9a178 
am: 9d53abbe3f

* commit '9d53abbe3f535c8e12e9a8b56ab45edb10e530c4':
  Add 900 for Russia - Short code used by Sberbank.

Change-Id: Ib17171ff6f7aca12c64413f06dbb06ec79b6d5f3
 2016-05-31 18:28:07 +00:00
Vasco Brito
9d53abbe3f Merge "Add 900 for Russia - Short code used by Sberbank." am: 9a769a4828 am: 29760d459a 
am: ef0ab9a178

* commit 'ef0ab9a178a752b6cfde89f29b36b1b3aea576cd':
  Add 900 for Russia - Short code used by Sberbank.

Change-Id: Ic24fdb1f8b4ab086d89cde6524a000a129ecd51a
 2016-05-31 18:22:29 +00:00
Vasco Brito
ef0ab9a178 Merge "Add 900 for Russia - Short code used by Sberbank." am: 9a769a4828 
am: 29760d459a

* commit '29760d459a59e916b7f6f2bbe36ba955896ecbad':
  Add 900 for Russia - Short code used by Sberbank.

Change-Id: I6d25ad6cb6a68fcb7071e331ca6ae30a811814cd
 2016-05-31 18:18:57 +00:00
Vasco Brito
29760d459a Merge "Add 900 for Russia - Short code used by Sberbank." 
am: 9a769a4828

* commit '9a769a482861496686a4138a0a9b612a08fce8f8':
  Add 900 for Russia - Short code used by Sberbank.

Change-Id: I0eac4eb99a84a489c1907a3d1fd4dd944527404e
 2016-05-31 18:10:42 +00:00
Alan Viverette
5d0e781858 Merge "Remove framework dependencies on Support* demos" 2016-05-31 18:08:24 +00:00
Treehugger Robot
9a769a4828 Merge "Add 900 for Russia - Short code used by Sberbank." 2016-05-31 18:06:29 +00:00
Steve McKay
a379fad3b9 Don't assert on uris with stack. 
This is legal arrangement when viewing Archives.
Bug: 28923366

Change-Id: I75a26edc8dac865f536a7c5bcdef1ba00b0883f0
 2016-05-31 11:01:43 -07:00
Alan Viverette
80bf1f8a3c Remove framework dependencies on Support* demos 
Change-Id: I5b3ba0e7a17ee5ccd93e97b3bd9c519cb8641d97
 2016-05-31 14:00:45 -04:00
Ian Rogers
0a3c9cd428 Merge "Fix bad locking." 2016-05-31 17:58:58 +00:00
sreevanis
1ce2279423 Updated image sizes and wrapped text around images. 
Fixed messagingstyle link in api-overview page.

Bug:28864173
Change-Id: I2e1a6036010b2e3aea8104e51e37a1697906691c
 2016-05-31 10:55:13 -07:00
Joe Onorato
9d97ee2ad2 Turn this wtf into just a log. 
We're seeing this a bunch, but the overhead from the WTF is concerning.
So turn it off.  It means that somewhere there is a race in tearing
down the app, or maybe some place fails to call back in some scenario.

Bug: 28932059
Change-Id: Ice14ade95bb9377ad622d440fb022953ad51c34c
 2016-05-31 10:49:08 -07:00
Hall Liu
5d06b41ef6 Merge "Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57 am: fe9877d877" into nyc-mr1-dev-plus-aosp 
am: 1bc922b544

* commit '1bc922b544549d2d5b3e45603b0c28da8d140b72':

Change-Id: Ie90cc4e830297a1410ac51822b3252f293b15661
 2016-05-31 17:47:52 +00:00
Ricky Wai
b2731df639 Merge "Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 am: 3c570f9a12" into nyc-mr1-dev-plus-aosp 
am: d6f9056ff8

* commit 'd6f9056ff8c7c2c32ca04ef8ad2aca9d4036d3c6':

Change-Id: I440afb7323cc2730d12918fa8e78457832a89038
 2016-05-31 17:47:49 +00:00
Hall Liu
95057570aa Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57 am: 49459e4ee8 
am: 4e52453d0e

* commit '4e52453d0efe7b3e05182bf43b5193b44aa1c88a':
  Disable app pinning when emergency call button pressed

Change-Id: Ifb4b7500d28674b3440d37920185cc266e1b1f54
 2016-05-31 17:47:46 +00:00
Ricky Wai
9e03aec000 Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 am: f2ca8f9c50 
am: a263edf14f

* commit 'a263edf14f67f098393311354fc424b710fae933':
  Do not get device owner admin info when device owner is null

Change-Id: Ibaad7c727c770fb98a077dff3d80ea0ba0f1e821
 2016-05-31 17:47:42 +00:00
Ian Rogers
923427ee40 Merge "Fix call to equals that could never succeed." 2016-05-31 17:45:01 +00:00
Android Build Merger (Role)
1bc922b544 Merge "Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57 am: fe9877d877" into nyc-mr1-dev-plus-aosp 2016-05-31 17:42:23 +00:00
Android Build Merger (Role)
d6f9056ff8 Merge "Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 am: 3c570f9a12" into nyc-mr1-dev-plus-aosp 2016-05-31 17:42:09 +00:00
Hall Liu
ba92817de8 Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57 
am: fe9877d877

* commit 'fe9877d877e2f497ac0daff1a4455b00efe57dbe':
  Disable app pinning when emergency call button pressed

Change-Id: Ib2c7b38dc76033c04feb43137c9526e38b472149
 2016-05-31 17:41:27 +00:00
Ricky Wai
45c5f9417c Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 
am: 3c570f9a12

* commit '3c570f9a1261532952f0fc11aefb53b0e558625d':
  Do not get device owner admin info when device owner is null

Change-Id: Iaa58b141c72bb4a419bc40fd8091dd28b239ddbc
 2016-05-31 17:41:25 +00:00
Hall Liu
4e52453d0e Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57 
am: 49459e4ee8

* commit '49459e4ee88dbaa342fb6add9af51ccbadc88d98':
  Disable app pinning when emergency call button pressed

Change-Id: I6cf2181d2f2f8a897b2d5eb8ab9482c11a55dd3c
 2016-05-31 17:41:12 +00:00
Dan Yu
fd85694e8a Merge "Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f am: 24d5e1b9ec am: 674cfd13af" into nyc-mr1-dev-plus-aosp 
am: c87bf0ad88

* commit 'c87bf0ad88a23b14065d41371d0f27a80e37f15e':

Change-Id: I83693351f9c00d7dc5623743119d02ceac550116
 2016-05-31 17:41:11 +00:00
Ricky Wai
a263edf14f Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 
am: f2ca8f9c50

* commit 'f2ca8f9c508342eae262348f6752bcd53aff2b83':
  Do not get device owner admin info when device owner is null

Change-Id: I29edf9a63d29c8016ee88f9ebe93d3533c09dbed
 2016-05-31 17:41:07 +00:00
Daniel Yu
4d11c821c1 Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f am: 24d5e1b9ec am: 094f3f8328 
am: ff25af1a7d

* commit 'ff25af1a7d644a058c10d704e49316622ecbb088':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: Ieb6f206b1e2c72953e6997d9d23324f34e5a143f
 2016-05-31 17:41:07 +00:00
Android Build Merger (Role)
c87bf0ad88 Merge "Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f am: 24d5e1b9ec am: 674cfd13af" into nyc-mr1-dev-plus-aosp 2016-05-31 17:37:42 +00:00
Hall Liu
49459e4ee8 Merge "Disable app pinning when emergency call button pressed" into nyc-dev 
am: 8b655e0f57

* commit '8b655e0f57b071756e7d6a3547eeabe35885bcc9':
  Disable app pinning when emergency call button pressed

Change-Id: Ibe8d37716ad1630359b3ef08350f485b0d1177a7
 2016-05-31 17:37:37 +00:00
Ricky Wai
f2ca8f9c50 Merge "Do not get device owner admin info when device owner is null" into nyc-dev 
am: 21f98459b7

* commit '21f98459b7740f57f6fd0415298cb5f5c0c7e0ae':
  Do not get device owner admin info when device owner is null

Change-Id: Iae5d7d5f9e5f5cf23d8c02bf9a4322e4569be9de
 2016-05-31 17:37:33 +00:00
Dan Yu
3dcf0cf439 Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f am: 24d5e1b9ec 
am: 674cfd13af

* commit '674cfd13af11f6fb5afc8bfe12d0170916f63b54':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: Ia42a12ab97aef348db265e790406316befda07c8
 2016-05-31 17:37:15 +00:00
Hall Liu
fe9877d877 Merge "Disable app pinning when emergency call button pressed" into nyc-dev 
am: 8b655e0f57

* commit '8b655e0f57b071756e7d6a3547eeabe35885bcc9':
  Disable app pinning when emergency call button pressed

Change-Id: I37575e58b60e2da8422732e9bb0359b0b6ff01a8
 2016-05-31 17:35:12 +00:00
Dan Yu
ff25af1a7d Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f am: 24d5e1b9ec 
am: 094f3f8328

* commit '094f3f83285bceb7c21012ccb7011696ce91ef18':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I81139553c2620426f8566b3642d369a41e639972
 2016-05-31 17:34:34 +00:00
Jae Seo
ee32ede540 TIF: Release an existing audio patch before creating a new one 
Bug: 28115694, Bug: 28954262
Change-Id: I04e2e9176a008b72468592db7dc3c7ce376b94f2
 2016-05-31 10:33:08 -07:00
Ricky Wai
3c570f9a12 Merge "Do not get device owner admin info when device owner is null" into nyc-dev 
am: 21f98459b7

* commit '21f98459b7740f57f6fd0415298cb5f5c0c7e0ae':
  Do not get device owner admin info when device owner is null

Change-Id: I8bca370306be7cafe536dc57d1b1d53dd0f50297
 2016-05-31 17:30:54 +00:00
Hall Liu
8b655e0f57 Merge "Disable app pinning when emergency call button pressed" into nyc-dev 2016-05-31 17:29:37 +00:00
Daniel Yu
674cfd13af Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f 
am: 24d5e1b9ec

* commit '24d5e1b9ec676eea4cb803f584dec3dadc170ab8':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I269a97d21f165148512cd6a76a262839bb659a41
 2016-05-31 17:25:26 +00:00
Daniel Yu
094f3f8328 Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c am: 2ad3221e5f 
am: 24d5e1b9ec

* commit '24d5e1b9ec676eea4cb803f584dec3dadc170ab8':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I72a5254fcc594069c8ecdba4ce2f496856702797
 2016-05-31 17:25:23 +00:00
Ricky Wai
21f98459b7 Merge "Do not get device owner admin info when device owner is null" into nyc-dev 2016-05-31 17:22:55 +00:00
Dan Yu
24d5e1b9ec Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c 
am: 2ad3221e5f

* commit '2ad3221e5f982dd0b9213c7e600d6186a1a9ea23':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: Iaf555b61ddb9fc6706a67775e76106c8187b4d27
 2016-05-31 17:21:48 +00:00
Daniel Yu
2ad3221e5f Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs 
am: 160ce9413c

* commit '160ce9413ccd5cef62b01f2e7e7fb601c5e8fbf2':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I646cb0a2e9ecc0f783444bb8b63334a37c6e22df
 2016-05-31 17:17:18 +00:00
Philip P. Moltmann
236b9e8eb4 Handle the uncommon case that a name is null 
Bug: 29037588
Change-Id: I697184bd1ae4d519f8f29bf612ba13843e6662cb
 2016-05-31 10:16:30 -07:00
James Hawkins
64ce4e7e81 am/UserController: Log system uptime at two 'boot complete' markers. 
ACTION_LOCKED_BOOT_COMPLETED and ACTION_BOOT_COMPLETED.

Bug: 28070626
Change-Id: I6ff8e840a1c1faf804d6889ac0c3ad96cca8d6f3
 2016-05-31 10:10:09 -07:00
Dan Yu
160ce9413c Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs 2016-05-31 17:09:24 +00:00
Ian Rogers
7392d1dee6 Merge "Fix NaN test." 2016-05-31 17:04:39 +00:00
Ricky Wai
90c9dbc919 Do not get device owner admin info when device owner is null 
Bug: 29043723
Change-Id: I355c549f891a5e71f654f42ed16a7139da86482a
 2016-05-31 18:01:46 +01:00
Jason Monk
0b2e1ca525 Merge "resolve merge conflicts of 6c16d44 to master" 2016-05-31 16:24:44 +00:00
Vasco Brito
2ee4078de4 Add 900 for Russia - Short code used by Sberbank. 
Sberbank SMS banking solution uses 900 short code.
They have requested this shortcode to be listed has premium to reduce banking fraud.

bug: 28423611

Change-Id: I82dfe012a1e55b2d025c24e50149fa01551a92ed
Signed-off-by: Vasco Brito <vascob@google.com>
 2016-05-31 16:11:27 +00:00
Philip P. Moltmann
1edb3df9bc Merge "Allow to select range unless we are finishing" 2016-05-31 16:08:47 +00:00
Jason Monk
e6f99da685 resolve merge conflicts of 6c16d44 to master 
Change-Id: I74053979cae4ead8c1cfdb454947acd15e870d48
 2016-05-31 11:43:54 -04:00